From: Chas Williams <chas@cmf.nrl.navy.mil>
Date: Thu, 2 Jun 2005 06:21:57 +0000 (+0000)
Subject: STABLE14-solaris10-optimization-20050602
X-Git-Tag: openafs-devel-1_3_84~8
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=6730941098ce73b8f1750dfaa0ae0e00ab1a241b;p=packages%2Fo%2Fopenafs.git

STABLE14-solaris10-optimization-20050602

FIXES 17262

declare certain things volatile to make solaris compiler less cranky


(cherry picked from commit 23cbd8f646dac8dbe3d5615e8a59e1170a281f07)
---

diff --git a/src/des/des.c b/src/des/des.c
index b4f7bf610..780561196 100644
--- a/src/des/des.c
+++ b/src/des/des.c
@@ -92,7 +92,7 @@ des_ecb_encrypt(void * clear, void * cipher,
 #endif
 #endif
     afs_uint32 P_temp;
-    register unsigned char *P_temp_p = (unsigned char *)&P_temp;
+    volatile unsigned char *P_temp_p = (unsigned char *)&P_temp;
 #ifdef BITS16
     sbox_out S_out;
     afs_uint32 *S_out_p = (afs_uint32 *) & S_out;
diff --git a/src/rxkad/domestic/fcrypt.c b/src/rxkad/domestic/fcrypt.c
index ec336a224..62f6d8278 100644
--- a/src/rxkad/domestic/fcrypt.c
+++ b/src/rxkad/domestic/fcrypt.c
@@ -112,9 +112,9 @@ fc_ecb_encrypt(void * clear, void * cipher,
 	       fc_KeySchedule schedule, int encrypt)
 {
     afs_uint32 L, R;
-    afs_uint32 S, P;
-    unsigned char *Pchar = (unsigned char *)&P;
-    unsigned char *Schar = (unsigned char *)&S;
+    volatile afs_uint32 S, P;
+    volatile unsigned char *Pchar = (unsigned char *)&P;
+    volatile unsigned char *Schar = (unsigned char *)&S;
     int i;
 
 #if defined(vax) || (defined(mips) && defined(MIPSEL)) || defined(AFSLITTLE_ENDIAN)