From 0da06d9faf9e865c7d16a358a30ebe1a0014a709 Mon Sep 17 00:00:00 2001
From: Tom Lane
Date: Fri, 1 May 2020 17:28:00 -0400
Subject: Get rid of trailing semicolons in C macro definitions.

Writing a trailing semicolon in a macro is almost never the right thing,
because you almost always want to write a semicolon after each macro
call instead.  (Even if there was some reason to prefer not to, pgindent
would probably make a hash of code formatted that way; so within PG the
rule should basically be "don't do it".)  Thus, if we have a semi inside
the macro, the compiler sees "something;;".  Much of the time the extra
empty statement is harmless, but it could lead to mysterious syntax
errors at call sites.  In perhaps an overabundance of neatnik-ism, let's
run around and get rid of the excess semicolons whereever possible.

The only thing worse than a mysterious syntax error is a mysterious
syntax error that only happens in the back branches; therefore,
backpatch these changes where relevant, which is most of them because
most of these mistakes are old.  (The lack of reported problems shows
that this is largely a hypothetical issue, but still, it could bite
us in some future patch.)

John Naylor and Tom Lane

Discussion: https://postgr.es/m/CACPNZCs0qWTqJ2QUSGJ07B7uvAvzMb-KbG2q+oo+J3tsWN5cqw@mail.gmail.com
---
 contrib/btree_gist/btree_ts.c        | 5 +++--
 contrib/btree_gist/btree_utils_num.h | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'contrib/btree_gist')

diff --git a/contrib/btree_gist/btree_ts.c b/contrib/btree_gist/btree_ts.c
index 3b07969dee8..2671ba961cd 100644
--- a/contrib/btree_gist/btree_ts.c
+++ b/contrib/btree_gist/btree_ts.c
@@ -341,12 +341,13 @@ gbt_ts_union(PG_FUNCTION_ARGS)
 }
 
 
-#define penalty_check_max_float(val) do { \
+#define penalty_check_max_float(val) \
+	do { \
 		if ( val > FLT_MAX ) \
 				val = FLT_MAX; \
 		if ( val < -FLT_MAX ) \
 				val = -FLT_MAX; \
-} while(false);
+	} while (0)
 
 
 Datum
diff --git a/contrib/btree_gist/btree_utils_num.h b/contrib/btree_gist/btree_utils_num.h
index 1fedfbe82da..cec69861726 100644
--- a/contrib/btree_gist/btree_utils_num.h
+++ b/contrib/btree_gist/btree_utils_num.h
@@ -74,7 +74,7 @@ typedef struct
 	(*(result)) += (float) ( ((double)(tmp)) / ( (double)(tmp) + ( ((double)(oupper))*0.49F - ((double)(olower))*0.49F ) ) ); \
 	(*(result)) *= (FLT_MAX / (((GISTENTRY *) PG_GETARG_POINTER(0))->rel->rd_att->natts + 1)); \
   } \
-} while (0);
+} while (0)
 
 
 /*
-- 
cgit v1.2.3