[tor-commits] [tor/master] Use STMT_BEGIN/END in parse_int.c so coccinelle can handle it.
teor at torproject.org
teor at torproject.org
Thu Oct 24 00:01:21 UTC 2019
commit d1cdb1a24e6289d5ce6f2c1433395abae7185e6e
Author: Nick Mathewson <nickm at torproject.org>
Date: Wed Oct 9 12:57:37 2019 -0400
Use STMT_BEGIN/END in parse_int.c so coccinelle can handle it.
---
src/lib/string/parse_int.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/lib/string/parse_int.c b/src/lib/string/parse_int.c
index fbdd554a4..fd4422ecd 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,
More information about the tor-commits
mailing list