Replace a macro by a function

Using a macro is ugly and not justified here.

Discussion: https://www.postgresql.org/message-id/flat/4ad69a4c-cc9b-0dfe-0352-8b1b0cd36c7b@2ndquadrant.com

diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
index 7d97b96e728c0ed7cdc00e86a9e857ba1867bffe..13f1d8c3dc7f41c4e3f6fd29ca2c7d9b7120a31a 100644 (file)
--- a/src/backend/access/transam/xlog.c
+++ b/src/backend/access/transam/xlog.c
@@ -6228,16 +6228,17 @@ GetXLogReceiptTime(TimestampTz *rtime, bool *fromStream)
  * Note that text field supplied is a parameter name and does not require
  * translation
  */
-#define RecoveryRequiresIntParameter(param_name, currValue, minValue) \
-do { \
-   if ((currValue) < (minValue)) \
-       ereport(ERROR, \
-               (errcode(ERRCODE_INVALID_PARAMETER_VALUE), \
-                errmsg("hot standby is not possible because %s = %d is a lower setting than on the primary server (its value was %d)", \
-                       param_name, \
-                       currValue, \
-                       minValue))); \
-} while(0)
+static void
+RecoveryRequiresIntParameter(const char *param_name, int currValue, int minValue)
+{
+   if (currValue < minValue)
+       ereport(ERROR,
+               (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+                errmsg("hot standby is not possible because %s = %d is a lower setting than on the primary server (its value was %d)",
+                       param_name,
+                       currValue,
+                       minValue)));
+}
 
 /*
  * Check to see if required parameters are set high enough on this server