[openssl-commits] [openssl] OpenSSL_1_0_0-stable update

Dr. Stephen Henson steve at openssl.org
Sun Mar 8 17:24:06 UTC 2015


The branch OpenSSL_1_0_0-stable has been updated
       via  394a30c2f8f68c5d657a9eef9da4941a8e66c0c0 (commit)
      from  36971258e3e47f04671f5f8e828293b253b4a79a (commit)


- Log -----------------------------------------------------------------
commit 394a30c2f8f68c5d657a9eef9da4941a8e66c0c0
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Sun Mar 8 16:57:46 2015 +0000

    Fix warnings.
    
    Fix compiler warnings (similar to commit 25012d5e79)
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 crypto/md32_common.h | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/crypto/md32_common.h b/crypto/md32_common.h
index 0004268..018b99e 100644
--- a/crypto/md32_common.h
+++ b/crypto/md32_common.h
@@ -225,15 +225,13 @@
 #  define HOST_c2l(c,l)   (l =(((unsigned long)(*((c)++)))<<24),          \
                          l|=(((unsigned long)(*((c)++)))<<16),          \
                          l|=(((unsigned long)(*((c)++)))<< 8),          \
-                         l|=(((unsigned long)(*((c)++)))    ),          \
-                         l)
+                         l|=(((unsigned long)(*((c)++)))    )   )
 # endif
 # ifndef HOST_l2c
 #  define HOST_l2c(l,c)   (*((c)++)=(unsigned char)(((l)>>24)&0xff),      \
                          *((c)++)=(unsigned char)(((l)>>16)&0xff),      \
                          *((c)++)=(unsigned char)(((l)>> 8)&0xff),      \
-                         *((c)++)=(unsigned char)(((l)    )&0xff),      \
-                         l)
+                         *((c)++)=(unsigned char)(((l)    )&0xff)   )
 # endif
 
 #elif defined(DATA_ORDER_IS_LITTLE_ENDIAN)
@@ -253,8 +251,8 @@
 # if defined(__i386) || defined(__i386__) || defined(__x86_64) || defined(__x86_64__)
 #  ifndef B_ENDIAN
    /* See comment in DATA_ORDER_IS_BIG_ENDIAN section. */
-#   define HOST_c2l(c,l) ((l)=*((const unsigned int *)(c)), (c)+=4, l)
-#   define HOST_l2c(l,c) (*((unsigned int *)(c))=(l), (c)+=4, l)
+#   define HOST_c2l(c,l) ((l)=*((const unsigned int *)(c)), (c)+=4)
+#   define HOST_l2c(l,c) (*((unsigned int *)(c))=(l), (c)+=4)
 #  endif
 # endif
 


More information about the openssl-commits mailing list