remove return value from HOST_c2l/l2c macros

These macros and asm inlines simulate a function returning a value, but
nothing ever uses this return value. Remove the pseudo-returns and
(void) casts discarding the unused values.

This, maybe unsurprisingly, speeds things up a bit. It also removes the
GCC 4.9 warnings about unused values.

ok miod@ deraadt@

1 files changed, 32 insertions, 32 deletions

diff --git a/src/lib/libcrypto/md32_common.h b/src/lib/libcrypto/md32_common.h
index 59de5ee885..24d003e774 100644
--- a/src/lib/libcrypto/md32_common.h
+++ b/src/lib/libcrypto/md32_common.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: md32_common.h,v 1.17 2014/08/12 15:02:52 bcook Exp $ */
+/* $OpenBSD: md32_common.h,v 1.18 2014/08/18 19:11:48 bcook Exp $ */
 /* ====================================================================
  * Copyright (c) 1999-2007 The OpenSSL Project.  All rights reserved.
  *
@@ -167,27 +167,27 @@ static inline uint32_t ROTATE(uint32_t a, uint32_t n)
                                    (c)+=4; (l)=r;                       })
 #  define HOST_l2c(l,c) ({ unsigned int r=(l);                  \
                                    asm ("bswapl %0":"=r"(r):"0"(r));    \
-                                   *((unsigned int *)(c))=r; (c)+=4; r; })
+                                   *((unsigned int *)(c))=r; (c)+=4;    })
 # endif
 #endif
 #if defined(__s390__) || defined(__s390x__)
-# 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
 
 #ifndef HOST_c2l
-#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)
+#define HOST_c2l(c,l) do {l =(((unsigned long)(*((c)++)))<<24); \
+                          l|=(((unsigned long)(*((c)++)))<<16); \
+                          l|=(((unsigned long)(*((c)++)))<< 8); \
+                          l|=(((unsigned long)(*((c)++)))    ); \
+                      } while (0)
 #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)
+#define HOST_l2c(l,c) do {*((c)++)=(unsigned char)(((l)>>24)&0xff);     \
+                          *((c)++)=(unsigned char)(((l)>>16)&0xff);     \
+                          *((c)++)=(unsigned char)(((l)>> 8)&0xff);     \
+                          *((c)++)=(unsigned char)(((l)    )&0xff);     \
+                      } while (0)
 #endif
 
 #elif defined(DATA_ORDER_IS_LITTLE_ENDIAN)
@@ -196,30 +196,30 @@ static inline uint32_t ROTATE(uint32_t a, uint32_t n)
 # if defined(__s390x__)
 #  define HOST_c2l(c,l) ({ asm ("lrv    %0,%1"                  \
                                    :"=d"(l) :"m"(*(const unsigned int *)(c)));\
-                                   (c)+=4; (l);                         })
+                                   (c)+=4;                              })
 #  define HOST_l2c(l,c) ({ asm ("strv   %1,%0"                  \
                                    :"=m"(*(unsigned int *)(c)) :"d"(l));\
-                                   (c)+=4; (l);                         })
+                                   (c)+=4;                              })
 # endif
 #endif
 #if defined(__i386) || defined(__i386__) || defined(__x86_64) || defined(__x86_64__)
-#  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
 
 #ifndef HOST_c2l
-#define HOST_c2l(c,l)   (l =(((unsigned long)(*((c)++)))    ),          \
-                         l|=(((unsigned long)(*((c)++)))<< 8),          \
-                         l|=(((unsigned long)(*((c)++)))<<16),          \
-                         l|=(((unsigned long)(*((c)++)))<<24),          \
-                         l)
+#define HOST_c2l(c,l) do {l =(((unsigned long)(*((c)++)))    ); \
+                          l|=(((unsigned long)(*((c)++)))<< 8); \
+                          l|=(((unsigned long)(*((c)++)))<<16); \
+                          l|=(((unsigned long)(*((c)++)))<<24); \
+                      } while (0)
 #endif
 #ifndef HOST_l2c
-#define HOST_l2c(l,c)   (*((c)++)=(unsigned char)(((l)    )&0xff),      \
-                         *((c)++)=(unsigned char)(((l)>> 8)&0xff),      \
-                         *((c)++)=(unsigned char)(((l)>>16)&0xff),      \
-                         *((c)++)=(unsigned char)(((l)>>24)&0xff),      \
-                         l)
+#define HOST_l2c(l,c) do {*((c)++)=(unsigned char)(((l)    )&0xff);     \
+                          *((c)++)=(unsigned char)(((l)>> 8)&0xff);     \
+                          *((c)++)=(unsigned char)(((l)>>16)&0xff);     \
+                          *((c)++)=(unsigned char)(((l)>>24)&0xff);     \
+                      } while (0)
 #endif
 
 #endif
@@ -306,11 +306,11 @@ int HASH_FINAL (unsigned char *md, HASH_CTX *c)
 
         p += HASH_CBLOCK - 8;
 #if   defined(DATA_ORDER_IS_BIG_ENDIAN)
-        (void)HOST_l2c(c->Nh, p);
-        (void)HOST_l2c(c->Nl, p);
+        HOST_l2c(c->Nh, p);
+        HOST_l2c(c->Nl, p);
 #elif defined(DATA_ORDER_IS_LITTLE_ENDIAN)
-        (void)HOST_l2c(c->Nl, p);
-        (void)HOST_l2c(c->Nh, p);
+        HOST_l2c(c->Nl, p);
+        HOST_l2c(c->Nh, p);
 #endif
         p -= HASH_CBLOCK;
         HASH_BLOCK_DATA_ORDER (c, p, 1);