From 498ddc0a254d80f8db6f2b6eabf45a6bdb05afb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Thu, 9 Feb 2017 15:31:03 +0100 Subject: [PATCH] Silent compiler warnings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit GCC 7 produces warnings like: tests/test-bson.c:1709:12: warning: suggest parentheses around assignment used as truth value [-Wparentheses] ASSERT (buf = bson_reserve_buffer (&stack_alloced, src.len)); or tests/test-type.c:134:19: warning: unused variable 'expected' [-Wunused-variable] const char *expected = NULL; ^~~~~~~~ This patch fixes it. The assert conditions could compare to NULL. Signed-off-by: Petr Písař --- tests/test-bson.c | 8 ++++---- tests/test-type.c | 2 -- tests/test-value.c | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/tests/test-bson.c b/tests/test-bson.c index 461b80d..6f6687b 100644 --- a/tests/test-bson.c +++ b/tests/test-bson.c @@ -1706,7 +1706,7 @@ test_bson_reserve_buffer (void) /* inline, stack-allocated */ bson_init (&stack_alloced); BSON_APPEND_UTF8 (&src, "key", "value"); - ASSERT (buf = bson_reserve_buffer (&stack_alloced, src.len)); + ASSERT ((buf = bson_reserve_buffer (&stack_alloced, src.len))); ASSERT_CMPUINT32 (src.len, ==, stack_alloced.len); ASSERT (stack_alloced.flags & BSON_FLAG_INLINE); memcpy (buf, ((bson_impl_inline_t *) &src)->data, src.len); @@ -1717,7 +1717,7 @@ test_bson_reserve_buffer (void) /* spilled over, stack-allocated */ bloat (&src); bson_init (&stack_alloced); - ASSERT (buf = bson_reserve_buffer (&stack_alloced, src.len)); + ASSERT ((buf = bson_reserve_buffer (&stack_alloced, src.len))); ASSERT_CMPUINT32 (src.len, ==, stack_alloced.len); ASSERT (!(stack_alloced.flags & BSON_FLAG_INLINE)); memcpy (buf, ((bson_impl_alloc_t *) &src)->alloc, src.len); @@ -1730,7 +1730,7 @@ test_bson_reserve_buffer (void) heap_alloced = bson_new (); bson_init (&src); BSON_APPEND_UTF8 (&src, "key", "value"); - ASSERT (buf = bson_reserve_buffer (heap_alloced, src.len)); + ASSERT ((buf = bson_reserve_buffer (heap_alloced, src.len))); ASSERT_CMPUINT32 (src.len, ==, heap_alloced->len); ASSERT (heap_alloced->flags & BSON_FLAG_INLINE); memcpy (buf, ((bson_impl_inline_t *) &src)->data, src.len); @@ -1740,7 +1740,7 @@ test_bson_reserve_buffer (void) /* spilled over, heap-allocated */ heap_alloced = bson_new (); bloat (&src); - ASSERT (buf = bson_reserve_buffer (heap_alloced, src.len)); + ASSERT ((buf = bson_reserve_buffer (heap_alloced, src.len))); ASSERT_CMPUINT32 (src.len, ==, heap_alloced->len); ASSERT (!(heap_alloced->flags & BSON_FLAG_INLINE)); memcpy (buf, ((bson_impl_alloc_t *) &src)->alloc, src.len); diff --git a/tests/test-type.c b/tests/test-type.c index afe0cae..072b42d 100644 --- a/tests/test-type.c +++ b/tests/test-type.c @@ -131,8 +131,6 @@ test_bson_type (bson_t *scenario, test_bson_type_valid_cb valid) BSON_ASSERT (scenario); if (bson_iter_init_find (&iter, scenario, "valid")) { - const char *expected = NULL; - bson_iter_recurse (&iter, &inner_iter); while (bson_iter_next (&inner_iter)) { bson_iter_t test; diff --git a/tests/test-value.c b/tests/test-value.c index 4dfccba..59e1f8d 100644 --- a/tests/test-value.c +++ b/tests/test-value.c @@ -117,7 +117,7 @@ test_value_decimal128 (void) assert (bson_decimal128_from_string ("123.5", &dec)); doc = BCON_NEW ("decimal128", BCON_DECIMAL128 (&dec)); assert (bson_iter_init (&iter, doc) && bson_iter_next (&iter)); - assert (value = bson_iter_value (&iter)); + assert ((value = bson_iter_value (&iter))); bson_value_copy (value, ©); assert (bson_append_value (&other, bson_iter_key (&iter), -1, ©)); -- 2.7.4