diff options
| author | Daniel Gustafsson <daniel@yesql.se> | 2019-11-28 16:02:13 +0100 |
|---|---|---|
| committer | Daniel Gustafsson <daniel@yesql.se> | 2019-11-28 16:02:13 +0100 |
| commit | 66e21520f369ab92b49a515704b68fa842face85 (patch) | |
| tree | 94638c50b65153f5a2d1be0b02fac8b2f17ce7aa | |
| parent | bb8cf0516953eea24cdedee47d31db77e8ced0dc (diff) | |
| download | curl-66e21520f369ab92b49a515704b68fa842face85.tar.gz | |
curl_setup_once: consistently use WHILE_FALSE in macros
The WHILE_FALSE construction is used to avoid compiler warnings in
macro constructions. This fixes a few instances where it was not
used in order to keep the code consistent.
Closes #4649
Reviewed-by: Daniel Stenberg <daniel@haxx.se>
| -rw-r--r-- | lib/cookie.c | 2 | ||||
| -rw-r--r-- | lib/sha256.c | 4 | ||||
| -rw-r--r-- | lib/vssh/libssh.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/lib/cookie.c b/lib/cookie.c index f56bd85a9..7e68b0785 100644 --- a/lib/cookie.c +++ b/lib/cookie.c @@ -1226,7 +1226,7 @@ static int cookie_sort_ct(const void *p1, const void *p2) if(!d->field) \ goto fail; \ } \ - } while(0) + } WHILE_FALSE static struct Cookie *dup_cookie(struct Cookie *src) { diff --git a/lib/sha256.c b/lib/sha256.c index f9287af23..0dcd24c08 100644 --- a/lib/sha256.c +++ b/lib/sha256.c @@ -58,7 +58,7 @@ do { \ (a)[1] = (unsigned char)((((unsigned long) (val)) >> 16) & 0xff); \ (a)[2] = (unsigned char)((((unsigned long) (val)) >> 8) & 0xff); \ (a)[3] = (unsigned char)(((unsigned long) (val)) & 0xff); \ -} while(0) +} WHILE_FALSE; #ifdef HAVE_LONGLONG #define WPA_PUT_BE64(a, val) \ @@ -71,7 +71,7 @@ do { \ (a)[5] = (unsigned char)(((unsigned long long)(val)) >> 16); \ (a)[6] = (unsigned char)(((unsigned long long)(val)) >> 8); \ (a)[7] = (unsigned char)(((unsigned long long)(val)) & 0xff); \ -} while(0) +} WHILE_FALSE; #else #define WPA_PUT_BE64(a, val) \ do { \ diff --git a/lib/vssh/libssh.c b/lib/vssh/libssh.c index 070879d94..ef8745246 100644 --- a/lib/vssh/libssh.c +++ b/lib/vssh/libssh.c @@ -98,7 +98,7 @@ /* A recent macro provided by libssh. Or make our own. */ #ifndef SSH_STRING_FREE_CHAR #define SSH_STRING_FREE_CHAR(x) \ - do { if((x) != NULL) { ssh_string_free_char(x); x = NULL; } } while(0) + do { if((x) != NULL) { ssh_string_free_char(x); x = NULL; } } WHILE_FALSE #endif /* Local functions: */ |