summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Meyering <meyering@redhat.com>2011-01-23 18:57:50 +0100
committerJim Meyering <meyering@redhat.com>2011-01-23 18:57:50 +0100
commit9de94f53b5b63330b7658f3b63d06021aabfc7c6 (patch)
tree1a7d9aaa6edd5351ee9dab7455180d6d5ef9374a
parentce5367b6b3e4df909883f41f3ad6f12981f5a263 (diff)
downloaddiffutils-9de94f53b5b63330b7658f3b63d06021aabfc7c6.tar.gz
maint: avoid new syntax-check failure
* src/diff.c (specify_value): Use !STREQ(...), not strcmp(...) != 0. * src/diff3.c (main): Likewise.
-rw-r--r--src/diff.c2
-rw-r--r--src/diff3.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/diff.c b/src/diff.c
index 0992db9..0a25465 100644
--- a/src/diff.c
+++ b/src/diff.c
@@ -959,7 +959,7 @@ usage (void)
static void
specify_value (char const **var, char const *value, char const *option)
{
- if (*var && strcmp (*var, value) != 0)
+ if (*var && ! STREQ (*var, value))
{
error (0, 0, _("conflicting %s option value `%s'"), option, value);
try_help (NULL, NULL);
diff --git a/src/diff3.c b/src/diff3.c
index be36ad1..44bc17f 100644
--- a/src/diff3.c
+++ b/src/diff3.c
@@ -362,7 +362,7 @@ main (int argc, char **argv)
rev_mapping[mapping[i]] = i;
for (i = 0; i < 3; i++)
- if (strcmp (file[i], "-") != 0)
+ if (! STREQ (file[i], "-"))
{
if (stat (file[i], &statb) < 0)
perror_with_exit (file[i]);