diff options
| author | David Benjamin <davidben@chromium.org> | 2015-12-07 21:36:34 +0300 |
|---|---|---|
| committer | Adam Langley <agl@google.com> | 2015-12-16 23:02:37 +0300 |
| commit | 793c21e266a0d6b5994a8f5cba9bac569fbd3bc7 (patch) | |
| tree | bbd682b955fdd39ba34a24ee17f49b746a44f833 /crypto | |
| parent | 0aff3ffb8882a161de9550cc4ea8caacc713aadb (diff) | |
Make HOST_l2c return void.
Nothing ever uses the return value. It'd be better off discarding it rather
than make callers stick (void) everywhere.
Change-Id: Ia28c970a1e5a27db441e4511249589d74408849b
Reviewed-on: https://boringssl-review.googlesource.com/6653
Reviewed-by: Adam Langley <agl@google.com>
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/digest/md32_common.h | 28 | ||||
| -rw-r--r-- | crypto/md4/md4.c | 8 | ||||
| -rw-r--r-- | crypto/md5/md5.c | 8 | ||||
| -rw-r--r-- | crypto/sha/sha1.c | 10 | ||||
| -rw-r--r-- | crypto/sha/sha256.c | 6 |
5 files changed, 30 insertions, 30 deletions
diff --git a/crypto/digest/md32_common.h b/crypto/digest/md32_common.h index 25665db8..4f1faf16 100644 --- a/crypto/digest/md32_common.h +++ b/crypto/digest/md32_common.h @@ -196,11 +196,11 @@ extern "C" { #endif #ifndef HOST_l2c -#define HOST_l2c(l, c) \ - (*((c)++) = (uint8_t)(((l) >> 24) & 0xff), \ - *((c)++) = (uint8_t)(((l) >> 16) & 0xff), \ - *((c)++) = (uint8_t)(((l) >> 8) & 0xff), \ - *((c)++) = (uint8_t)(((l)) & 0xff), l) +#define HOST_l2c(l, c) \ + (void)(*((c)++) = (uint8_t)(((l) >> 24) & 0xff), \ + *((c)++) = (uint8_t)(((l) >> 16) & 0xff), \ + *((c)++) = (uint8_t)(((l) >> 8) & 0xff), \ + *((c)++) = (uint8_t)(((l)) & 0xff)) #endif #elif defined(DATA_ORDER_IS_LITTLE_ENDIAN) @@ -219,11 +219,11 @@ extern "C" { #endif #ifndef HOST_l2c -#define HOST_l2c(l, c) \ - (*((c)++) = (uint8_t)(((l)) & 0xff), \ - *((c)++) = (uint8_t)(((l) >> 8) & 0xff), \ - *((c)++) = (uint8_t)(((l) >> 16) & 0xff), \ - *((c)++) = (uint8_t)(((l) >> 24) & 0xff), l) +#define HOST_l2c(l, c) \ + (void)(*((c)++) = (uint8_t)(((l)) & 0xff), \ + *((c)++) = (uint8_t)(((l) >> 8) & 0xff), \ + *((c)++) = (uint8_t)(((l) >> 16) & 0xff), \ + *((c)++) = (uint8_t)(((l) >> 24) & 0xff)) #endif #endif /* DATA_ORDER */ @@ -301,11 +301,11 @@ int HASH_FINAL(uint8_t *md, HASH_CTX *c) { /* Append a 64-bit length to the block and process it. */ uint8_t *p = c->data + 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 assert(p == c->data + HASH_CBLOCK); HASH_BLOCK_DATA_ORDER(c->h, c->data, 1); diff --git a/crypto/md4/md4.c b/crypto/md4/md4.c index 52296ebb..86a540b4 100644 --- a/crypto/md4/md4.c +++ b/crypto/md4/md4.c @@ -84,13 +84,13 @@ void md4_block_data_order(uint32_t *state, const uint8_t *data, size_t num); do { \ uint32_t ll; \ ll = (c)->h[0]; \ - (void) HOST_l2c(ll, (s)); \ + HOST_l2c(ll, (s)); \ ll = (c)->h[1]; \ - (void) HOST_l2c(ll, (s)); \ + HOST_l2c(ll, (s)); \ ll = (c)->h[2]; \ - (void) HOST_l2c(ll, (s)); \ + HOST_l2c(ll, (s)); \ ll = (c)->h[3]; \ - (void) HOST_l2c(ll, (s)); \ + HOST_l2c(ll, (s)); \ } while (0) #define HASH_BLOCK_DATA_ORDER md4_block_data_order diff --git a/crypto/md5/md5.c b/crypto/md5/md5.c index 5eae2de1..66483b84 100644 --- a/crypto/md5/md5.c +++ b/crypto/md5/md5.c @@ -106,13 +106,13 @@ void md5_block_data_order(uint32_t *state, const uint8_t *data, size_t num); do { \ uint32_t ll; \ ll = (c)->h[0]; \ - (void) HOST_l2c(ll, (s)); \ + HOST_l2c(ll, (s)); \ ll = (c)->h[1]; \ - (void) HOST_l2c(ll, (s)); \ + HOST_l2c(ll, (s)); \ ll = (c)->h[2]; \ - (void) HOST_l2c(ll, (s)); \ + HOST_l2c(ll, (s)); \ ll = (c)->h[3]; \ - (void) HOST_l2c(ll, (s)); \ + HOST_l2c(ll, (s)); \ } while (0) #define HASH_BLOCK_DATA_ORDER md5_block_data_order diff --git a/crypto/sha/sha1.c b/crypto/sha/sha1.c index 0396b95a..74e841ca 100644 --- a/crypto/sha/sha1.c +++ b/crypto/sha/sha1.c @@ -102,15 +102,15 @@ uint8_t *SHA1(const uint8_t *data, size_t len, uint8_t *out) { do { \ uint32_t ll; \ ll = (c)->h[0]; \ - (void) HOST_l2c(ll, (s)); \ + HOST_l2c(ll, (s)); \ ll = (c)->h[1]; \ - (void) HOST_l2c(ll, (s)); \ + HOST_l2c(ll, (s)); \ ll = (c)->h[2]; \ - (void) HOST_l2c(ll, (s)); \ + HOST_l2c(ll, (s)); \ ll = (c)->h[3]; \ - (void) HOST_l2c(ll, (s)); \ + HOST_l2c(ll, (s)); \ ll = (c)->h[4]; \ - (void) HOST_l2c(ll, (s)); \ + HOST_l2c(ll, (s)); \ } while (0) #define HASH_UPDATE SHA1_Update diff --git a/crypto/sha/sha256.c b/crypto/sha/sha256.c index 85bbad56..0ddacbad 100644 --- a/crypto/sha/sha256.c +++ b/crypto/sha/sha256.c @@ -155,13 +155,13 @@ int SHA224_Final(uint8_t *md, SHA256_CTX *ctx) { case SHA224_DIGEST_LENGTH: \ for (nn = 0; nn < SHA224_DIGEST_LENGTH / 4; nn++) { \ ll = (c)->h[nn]; \ - (void) HOST_l2c(ll, (s)); \ + HOST_l2c(ll, (s)); \ } \ break; \ case SHA256_DIGEST_LENGTH: \ for (nn = 0; nn < SHA256_DIGEST_LENGTH / 4; nn++) { \ ll = (c)->h[nn]; \ - (void) HOST_l2c(ll, (s)); \ + HOST_l2c(ll, (s)); \ } \ break; \ default: \ @@ -170,7 +170,7 @@ int SHA224_Final(uint8_t *md, SHA256_CTX *ctx) { } \ for (nn = 0; nn < (c)->md_len / 4; nn++) { \ ll = (c)->h[nn]; \ - (void) HOST_l2c(ll, (s)); \ + HOST_l2c(ll, (s)); \ } \ break; \ } \ |