commit e80a032b61e3c793ad0d1627074b8750f7cfec48 Author: Nick Mathewson nickm@torproject.org Date: Thu Jun 2 10:05:03 2016 -0400
Add clang's -Wstring-conversion, and fix the one place it hits --- configure.ac | 1 + src/test/test_relaycell.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac index 85ba939..7945737 100644 --- a/configure.ac +++ b/configure.ac @@ -1851,6 +1851,7 @@ if test "x$enable_gcc_warnings_advisory" != "xno"; then -Wstatic-local-in-inline -Wstrict-overflow=2 -Wstring-compare + -Wstring-conversion -Wstrlcpy-strlcat-size -Wstrncat-size -Wsuggest-attribute=format diff --git a/src/test/test_relaycell.c b/src/test/test_relaycell.c index 1cd9ff0..fb67489 100644 --- a/src/test/test_relaycell.c +++ b/src/test/test_relaycell.c @@ -95,7 +95,7 @@ test_relaycell_resolved(void *arg) tt_int_op(srm_ncalls, OP_EQ, 1); \ tt_ptr_op(srm_conn, OP_EQ, entryconn); \ tt_int_op(srm_atype, OP_EQ, (atype)); \ - if (answer) { \ + if ((answer) != NULL) { \ tt_int_op(srm_alen, OP_EQ, sizeof(answer)-1); \ tt_int_op(srm_alen, OP_LT, 512); \ tt_int_op(srm_answer_is_set, OP_EQ, 1); \