From 2eca3218ca1ac8fa582f86ab5f055474ad369d7d Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sat, 10 Dec 2022 12:56:44 -0500 Subject: Fix "suspicious" string comparisons --- NEWS | 1 + src/.clang-tidy | 1 - src/sratom.c | 2 +- test/.clang-tidy | 1 - test/test_sratom.c | 2 +- 5 files changed, 3 insertions(+), 4 deletions(-) diff --git a/NEWS b/NEWS index bf20196..5c4a8e1 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,6 @@ sratom (0.6.15) unstable; urgency=medium + * Clean up code * Fix dependencies in pkg-config file * Override pkg-config dependency within meson * Replace duplicated dox_to_sphinx script with sphinxygen dependency diff --git a/src/.clang-tidy b/src/.clang-tidy index 1b4b226..c50cd8a 100644 --- a/src/.clang-tidy +++ b/src/.clang-tidy @@ -5,7 +5,6 @@ Checks: > -*-magic-numbers, -*-narrowing-conversions, -bugprone-easily-swappable-parameters, - -bugprone-suspicious-string-compare, -cert-err33-c, -cert-err34-c, -clang-analyzer-unix.Malloc, diff --git a/src/sratom.c b/src/sratom.c index fd984d0..2222dd4 100644 --- a/src/sratom.c +++ b/src/sratom.c @@ -282,7 +282,7 @@ sratom_write(Sratom* sratom, object = serd_node_new_file_uri(str, NULL, NULL, true); } else { if (!sratom->base_uri.buf || - strncmp((const char*)sratom->base_uri.buf, "file://", 7)) { + !!strncmp((const char*)sratom->base_uri.buf, "file://", 7)) { fprintf(stderr, "warning: Relative path but base is not a file URI.\n"); fprintf(stderr, "warning: Writing ambiguous atom:Path literal.\n"); object = serd_node_from_string(SERD_LITERAL, str); diff --git a/test/.clang-tidy b/test/.clang-tidy index e4b41e4..d335ce8 100644 --- a/test/.clang-tidy +++ b/test/.clang-tidy @@ -3,7 +3,6 @@ Checks: > -*-magic-numbers, - -bugprone-suspicious-string-compare, -cert-err33-c, -readability-identifier-length, InheritParentConfig: true diff --git a/test/test_sratom.c b/test/test_sratom.c index 246b5c5..3fa2db6 100644 --- a/test/test_sratom.c +++ b/test/test_sratom.c @@ -362,7 +362,7 @@ test(SerdEnv* env, bool top_level, bool pretty_numbers) LV2_ATOM_BODY(parsed)); printf("# Turtle => Atom\n\n%s", instr); - if (strcmp(outstr, instr)) { + if (!!strcmp(outstr, instr)) { return test_fail("Re-serialized string differs from original\n"); } free(instr); -- cgit v1.2.1