From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 9 Oct 2019 16:57:37 +0000 (-0400)
Subject: Use STMT_BEGIN/END in parse_int.c so coccinelle can handle it.
X-Git-Tag: tor-0.4.3.1-alpha~262^2~1^2~7
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d1cdb1a24e6289d5ce6f2c1433395abae7185e6e;p=thirdparty%2Ftor.git

Use STMT_BEGIN/END in parse_int.c so coccinelle can handle it.
---

diff --git a/src/lib/string/parse_int.c b/src/lib/string/parse_int.c
index fbdd554a47..fd4422ecd0 100644
--- a/src/lib/string/parse_int.c
+++ b/src/lib/string/parse_int.c
@@ -9,6 +9,7 @@
  **/
 
 #include "lib/string/parse_int.h"
+#include "lib/cc/compat_compiler.h"
 
 #include <errno.h>
 #include <stdlib.h>
@@ -17,6 +18,7 @@
 /* Helper: common code to check whether the result of a strtol or strtoul or
  * strtoll is correct. */
 #define CHECK_STRTOX_RESULT()                           \
+  STMT_BEGIN                                            \
   /* Did an overflow occur? */                          \
   if (errno == ERANGE)                                  \
     goto err;                                           \
@@ -38,7 +40,8 @@
  err:                                                   \
   if (ok) *ok = 0;                                      \
   if (next) *next = endptr;                             \
-  return 0
+  return 0;                                             \
+  STMT_END
 
 /** Extract a long from the start of <b>s</b>, in the given numeric
  * <b>base</b>.  If <b>base</b> is 0, <b>s</b> is parsed as a decimal,