Changeset 9187

Timestamp:

02/09/12 14:38:24 (16 months ago)

Author:

ligon

Message:

Applied same compiler warning changes from 2.8.5 to trunk

src/kernel/linux-2.6/dcache.c
src/io/bmi/bmi_tcp/bmi-tcp.c

Location:

trunk/src

Files:

• io/bmi/bmi_tcp/bmi-tcp.c (modified) (2 diffs)
• kernel/linux-2.6/dcache.c (modified) (1 diff)

trunk/src/io/bmi/bmi_tcp/bmi-tcp.c

@@ -183 +183 @@
 #define BMI_TCP_ENC_HDR(hdr)                                            \
     do {                                                                \
-        *((uint32_t*)&((hdr).enc_hdr[0])) = htobmi32((hdr).magic_nr);   \
+        uint32_t *tmp32;                                                \
+        tmp32 = (uint32_t *)&(hdr).enc_hdr[0];                          \
+        *(tmp32) = htobmi32((hdr).magic_nr);                            \
         *((uint32_t*)&((hdr).enc_hdr[4])) = htobmi32((hdr).mode);       \
         *((uint64_t*)&((hdr).enc_hdr[8])) = htobmi64((hdr).tag);        \
@@ -191 +193 @@
 #define BMI_TCP_DEC_HDR(hdr)                                            \
     do {                                                                \
-        (hdr).magic_nr = bmitoh32(*((uint32_t*)&((hdr).enc_hdr[0])));   \
-        (hdr).mode = bmitoh32(*((uint32_t*)&((hdr).enc_hdr[4])));       \
-        (hdr).tag = bmitoh64(*((uint64_t*)&((hdr).enc_hdr[8])));        \
-        (hdr).size = bmitoh64(*((uint64_t*)&((hdr).enc_hdr[16])));      \
+        uint32_t tmp32;                                                 \
+        memcpy(&tmp32,&(hdr).enc_hdr[0],sizeof(uint32_t));              \
+        (hdr).magic_nr = bmitoh32(tmp32);                               \
+        (hdr).mode = bmitoh32(*((uint32_t*)&((hdr).enc_hdr[4])));       \
+        (hdr).tag = bmitoh64(*((uint64_t*)&((hdr).enc_hdr[8])));        \
+        (hdr).size = bmitoh64(*((uint64_t*)&((hdr).enc_hdr[16])));      \
     } while(0)                                              
+
 
 /* enumerate states that we care about */

trunk/src/kernel/linux-2.6/dcache.c

@@ -197 +197 @@
 
     if (nd && (nd->flags & LOOKUP_FOLLOW) &&
-        (!nd->flags & LOOKUP_CREATE))
+        ((!nd->flags) & (LOOKUP_CREATE)) )
     {
         gossip_debug(GOSSIP_DCACHE_DEBUG,