diff options
| author | Andreas Schneider <asn@samba.org> | 2019-05-08 16:54:30 +0200 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2019-05-08 16:33:24 +0000 |
| commit | a8f773e326d6bdfc1c9eb87a74c00108f6620c56 (patch) | |
| tree | 1a7eadeb4f6717b8b53bdd6af5e629973b79185c /lib/torture | |
| parent | be72dfbc8edc53ed191dc01668a53cafb5cd785d (diff) | |
| download | samba-a8f773e326d6bdfc1c9eb87a74c00108f6620c56.tar.gz | |
lib:torture: Fix string comparison macros where we directly pass NULL
See e.g. lib/util/tests/strlist.c +177
Found by GCC 9.
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'lib/torture')
| -rw-r--r-- | lib/torture/torture.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/torture/torture.h b/lib/torture/torture.h index 2921ae74b9b..a7f3f471b3a 100644 --- a/lib/torture/torture.h +++ b/lib/torture/torture.h @@ -323,7 +323,9 @@ void torture_result(struct torture_context *test, #define torture_assert_casestr_equal(torture_ctx,got,expected,cmt) \ do { const char *__got = (got), *__expected = (expected); \ if (!strequal(__got, __expected)) { \ - torture_result(torture_ctx, TORTURE_FAIL, __location__": "#got" was %s, expected %s: %s", __got, __expected, cmt); \ + torture_result(torture_ctx, TORTURE_FAIL, \ + __location__": "#got" was %s, expected %s: %s", \ + __got, __expected == NULL ? "null" : __expected, cmt); \ return false; \ } \ } while(0) @@ -332,8 +334,8 @@ void torture_result(struct torture_context *test, do { const char *__got = (got), *__expected = (expected); \ if (strcmp_safe(__got, __expected) != 0) { \ torture_result(torture_ctx, TORTURE_FAIL, \ - __location__": "#got" was %s, expected %s: %s", \ - __got, __expected, cmt); \ + __location__": "#got" was %s, expected %s: %s", \ + __got, __expected == NULL ? "NULL" : __expected, cmt); \ return false; \ } \ } while(0) |