tor

commit 86fdddccb27f15edcfd49038c87a0f66c11fb52e
parent 9cefc47231a4bb8024668fe7152a4fb811faaa1f
Author: George Kadianakis <desnacked@riseup.net>
Date:   Tue,  7 Jul 2020 15:34:14 +0300

Merge branch 'tor-github/pr/1973'

Diffstat:
M
src/test/test-memwipe.c
 | 
23
+++++++++++++++--------
M
src/test/test_config.c
 | 
2
++

2 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/src/test/test-memwipe.c b/src/test/test-memwipe.c
@@ -30,8 +30,8 @@ const char *s = NULL;
 #define BUF_LEN 2048
 
 #define FILL_BUFFER_IMPL()                                              \
+  do {                                                                  \
   unsigned int i;                                                       \
-  unsigned sum = 0;                                                     \
                                                                         \
   /* Fill up a 1k buffer with a recognizable pattern. */                \
   for (i = 0; i < BUF_LEN; i += strlen(s)) {                            \
@@ -42,7 +42,8 @@ const char *s = NULL;
   /* optimized away. */                                                 \
   for (i = 0; i < BUF_LEN; ++i) {                                       \
     sum += (unsigned char)buf[i];                                       \
-  }
+  }                                                                     \
+  } while (0)
 
 #ifdef OpenBSD
 /* Disable some of OpenBSD's malloc protections for this test. This helps
@@ -55,7 +56,8 @@ static unsigned
 fill_a_buffer_memset(void)
 {
   char buf[BUF_LEN];
-  FILL_BUFFER_IMPL()
+  unsigned sum = 0;
+  FILL_BUFFER_IMPL();
   memset(buf, 0, sizeof(buf));
   return sum;
 }
@@ -64,7 +66,8 @@ static unsigned
 fill_a_buffer_memwipe(void)
 {
   char buf[BUF_LEN];
-  FILL_BUFFER_IMPL()
+  unsigned sum = 0;
+  FILL_BUFFER_IMPL();
   memwipe(buf, 0, sizeof(buf));
   return sum;
 }
@@ -73,7 +76,8 @@ static unsigned
 fill_a_buffer_nothing(void)
 {
   char buf[BUF_LEN];
-  FILL_BUFFER_IMPL()
+  unsigned sum = 0;
+  FILL_BUFFER_IMPL();
   return sum;
 }
 
@@ -116,7 +120,8 @@ static unsigned
 fill_heap_buffer_memset(void)
 {
   char *buf = heap_buf = raw_malloc(BUF_LEN);
-  FILL_BUFFER_IMPL()
+  unsigned sum = 0;
+  FILL_BUFFER_IMPL();
   memset(buf, 0, BUF_LEN);
   raw_free(buf);
   return sum;
@@ -126,7 +131,8 @@ static unsigned
 fill_heap_buffer_memwipe(void)
 {
   char *buf = heap_buf = raw_malloc(BUF_LEN);
-  FILL_BUFFER_IMPL()
+  unsigned sum = 0;
+  FILL_BUFFER_IMPL();
   memwipe(buf, 0, BUF_LEN);
   raw_free(buf);
   return sum;
@@ -136,7 +142,8 @@ static unsigned
 fill_heap_buffer_nothing(void)
 {
   char *buf = heap_buf = raw_malloc(BUF_LEN);
-  FILL_BUFFER_IMPL()
+  unsigned sum = 0;
+  FILL_BUFFER_IMPL();
   raw_free(buf);
   return sum;
 }
diff --git a/src/test/test_config.c b/src/test/test_config.c
@@ -6413,11 +6413,13 @@ test_config_getinfo_config_names(void *arg)
   tor_free(answer);
 }
 
+#ifndef COCCI
 #define CONFIG_TEST(name, flags)                          \
   { #name, test_config_ ## name, flags, NULL, NULL }
 
 #define CONFIG_TEST_SETUP(suffix, name, flags, setup, setup_data) \
   { #name#suffix, test_config_ ## name, flags, setup, setup_data }
+#endif
 
 struct testcase_t config_tests[] = {
   CONFIG_TEST(adding_trusted_dir_server, TT_FORK),