MONGOCRYPT-783 address -Wextra-semi-stmt warnings (#974)

Author: eramongodb

kms-message/src/kms_kmip_reader_writer.c

@@ -279,7 +279,8 @@ kmip_reader_has_data (kmip_reader_t *reader)
 #define CHECK_REMAINING_BUFFER_AND_RET(read_size)   \
    if ((reader->pos + (read_size)) > reader->len) { \
       return false;                                 \
-   }
+   } else                                           \
+      ((void)0)
 
 bool
 kmip_reader_read_u8 (kmip_reader_t *reader, uint8_t *value)
@@ -346,7 +347,8 @@ kmip_reader_read_bytes (kmip_reader_t *reader, uint8_t **ptr, size_t length)
 #define CHECK_AND_RET(x) \
    if (!(x)) {           \
       return false;      \
-   }
+   } else                \
+      ((void)0)
 
 bool
 kmip_reader_read_tag (kmip_reader_t *reader, kmip_tag_type_t *tag)

kms-message/src/kms_message_private.h

@@ -140,6 +140,7 @@ kms_set_error (char *error, size_t size, const char *fmt, ...);
    if (!(stmt)) {                             \
       fprintf (stderr, "%s failed\n", #stmt); \
       abort ();                               \
-   }
+   } else                                     \
+       ((void)0)
 
 #endif /* KMS_MESSAGE_PRIVATE_H */

kms-message/src/sort.c

@@ -50,7 +50,7 @@
 
 #define CMP(x, y) cmp (x, y)
 #define swap(a, b)   \
-   {                 \
+   if (1) {          \
       s = b;         \
       i = size;      \
       do {           \
@@ -59,7 +59,8 @@
          *s++ = tmp; \
       } while (--i); \
       a -= size;     \
-   }
+   } else            \
+      ((void)0)
 
 void
 insertionsort (unsigned char *a, size_t n, size_t size, cmp_t cmp)

kms-message/test/test_kms_assert.h

@@ -53,7 +53,8 @@
 #define ASSERT(stmt)                             \
    if (!(stmt)) {                                \
       TEST_ERROR ("statement failed %s", #stmt); \
-   }
+   } else                                        \
+      ((void)0)
 
 #define ASSERT_CMPSTR_WITH_LEN(_expect, _expect_len, _actual, _actual_len)     \
    do {                                                                        \
@@ -98,7 +99,7 @@
          TEST_ERROR (                                                   \
             "comparison failed: %d %s %d", _a_int, #_operator, _b_int); \
       }                                                                 \
-   } while (0);
+   } while (0)
 
 #define ASSERT_CMPBYTES(                                                \
    expected_bytes, expected_len, actual_bytes, actual_len)              \

kms-message/test/test_kms_request.c

@@ -124,7 +124,7 @@ test_getline (char **lineptr, size_t *n, FILE *stream)
 {
    if (*lineptr == NULL && *n == 0) {
       realloc_buffer (lineptr, n, 128);
-   };
+   }
 
    // Sanity check
    if ((*lineptr == NULL && *n != 0) || (*lineptr != NULL && *n == 0)) {
@@ -760,7 +760,7 @@ kms_response_parser_test (void)
       kms_response_parser_feed (parser, (uint8_t *) "This is a test.", 15));
    ASSERT (0 == kms_response_parser_wants_bytes (parser, 123));
    response = kms_response_parser_get_response (parser);
-   ASSERT (response->status == 200)
+   ASSERT (response->status == 200);
    ASSERT_CMPSTR (response->body->str, "This is a test.");
 
    kms_response_destroy (response);