From 987460611ab08ebac83ead9a5ee316d3b3823e7f Mon Sep 17 00:00:00 2001 From: Jonathan Nieder Date: Thu, 12 Aug 2010 17:11:15 -0500 Subject: [PATCH] Standardize do { ... } while (0) style Signed-off-by: Jonathan Nieder Signed-off-by: Junio C Hamano --- base85.c | 6 +++--- cache.h | 2 +- diffcore.h | 8 ++++---- http.h | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/base85.c b/base85.c index e459feebb..781b5754f 100644 --- a/base85.c +++ b/base85.c @@ -7,9 +7,9 @@ #define say1(a,b) fprintf(stderr, a, b) #define say2(a,b,c) fprintf(stderr, a, b, c) #else -#define say(a) do {} while(0) -#define say1(a,b) do {} while(0) -#define say2(a,b,c) do {} while(0) +#define say(a) do { /* nothing */ } while (0) +#define say1(a,b) do { /* nothing */ } while (0) +#define say2(a,b,c) do { /* nothing */ } while (0) #endif static const char en85[] = { diff --git a/cache.h b/cache.h index c9fa3df7f..1e690d124 100644 --- a/cache.h +++ b/cache.h @@ -449,7 +449,7 @@ extern int init_db(const char *template_dir, unsigned int flags); alloc = alloc_nr(alloc); \ x = xrealloc((x), alloc * sizeof(*(x))); \ } \ - } while(0) + } while (0) /* Initialize and use the cache information */ extern int read_index(struct index_state *); diff --git a/diffcore.h b/diffcore.h index fed9b151b..05ebc115a 100644 --- a/diffcore.h +++ b/diffcore.h @@ -98,7 +98,7 @@ struct diff_queue_struct { (q)->queue = NULL; \ (q)->nr = (q)->alloc = 0; \ (q)->run = 0; \ - } while(0); + } while (0) extern struct diff_queue_struct diff_queued_diff; extern struct diff_filepair *diff_queue(struct diff_queue_struct *, @@ -118,9 +118,9 @@ void diff_debug_filespec(struct diff_filespec *, int, const char *); void diff_debug_filepair(const struct diff_filepair *, int); void diff_debug_queue(const char *, struct diff_queue_struct *); #else -#define diff_debug_filespec(a,b,c) do {} while(0) -#define diff_debug_filepair(a,b) do {} while(0) -#define diff_debug_queue(a,b) do {} while(0) +#define diff_debug_filespec(a,b,c) do { /* nothing */ } while (0) +#define diff_debug_filepair(a,b) do { /* nothing */ } while (0) +#define diff_debug_queue(a,b) do { /* nothing */ } while (0) #endif extern int diffcore_count_changes(struct diff_filespec *src, diff --git a/http.h b/http.h index a0b590159..173f74c82 100644 --- a/http.h +++ b/http.h @@ -23,10 +23,10 @@ #endif #if LIBCURL_VERSION_NUM < 0x070704 -#define curl_global_cleanup() do { /* nothing */ } while(0) +#define curl_global_cleanup() do { /* nothing */ } while (0) #endif #if LIBCURL_VERSION_NUM < 0x070800 -#define curl_global_init(a) do { /* nothing */ } while(0) +#define curl_global_init(a) do { /* nothing */ } while (0) #endif #if (LIBCURL_VERSION_NUM < 0x070c04) || (LIBCURL_VERSION_NUM == 0x071000) -- 2.30.2