diff options
| author | Gary V. Vaughan <gary@gnu.org> | 2013-09-18 13:38:55 +0700 |
|---|---|---|
| committer | Gary V. Vaughan <gary@gnu.org> | 2013-09-18 13:38:55 +0700 |
| commit | d3ac3947560b01e468796e4160b57b12970c4eb7 (patch) | |
| tree | 311fed6d773272d055a6d0836bca35d8197d1d5a | |
| parent | aef4d681e405d840aa2b6c5dcebdcd809dbf6c79 (diff) | |
| download | m4-d3ac3947560b01e468796e4160b57b12970c4eb7.tar.gz | |
maint: prefer STREQ/STRNEQ to strcmp contortions.
* m4/m4private (STRNEQ): New macro.
* m4/path.c (m4_load_filename): Use it.
* src/freeze.c (produce_frozen_state): Likewise.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
| -rw-r--r-- | m4/m4private.h | 1 | ||||
| -rw-r--r-- | m4/path.c | 2 | ||||
| -rw-r--r-- | src/freeze.c | 4 |
3 files changed, 4 insertions, 3 deletions
diff --git a/m4/m4private.h b/m4/m4private.h index 4833d39a..7dc207ac 100644 --- a/m4/m4private.h +++ b/m4/m4private.h @@ -621,6 +621,7 @@ extern void m4__include_init (m4 *); /* Avoid negative logic when comparing two strings. */ #define STREQ(a, b) (strcmp (a, b) == 0) +#define STRNEQ(a, b) (strcmp (a, b) != 0) #if DEBUG @@ -296,7 +296,7 @@ m4_load_filename (m4 *context, const m4_call_info *caller, if (!m4_get_posixly_correct_opt (context) && suffix - && (!strcmp (suffix, LT_MODULE_EXT) || !strcmp (suffix, ".la"))) + && (STREQ (suffix, LT_MODULE_EXT) || STREQ (suffix, ".la"))) { m4_module_load (context, filepath, obs); } diff --git a/src/freeze.c b/src/freeze.c index e53995a6..9f36e8cc 100644 --- a/src/freeze.c +++ b/src/freeze.c @@ -290,7 +290,7 @@ produce_frozen_state (m4 *context, const char *name) /* Dump quote delimiters. */ pair = m4_get_syntax_quotes (M4SYNTAX); - if (strcmp (pair->str1, DEF_LQUOTE) || strcmp (pair->str2, DEF_RQUOTE)) + if (STRNEQ (pair->str1, DEF_LQUOTE) || STRNEQ (pair->str2, DEF_RQUOTE)) { xfprintf (file, "Q%zu,%zu\n", pair->len1, pair->len2); produce_mem_dump (file, pair->str1, pair->len1); @@ -301,7 +301,7 @@ produce_frozen_state (m4 *context, const char *name) /* Dump comment delimiters. */ pair = m4_get_syntax_comments (M4SYNTAX); - if (strcmp (pair->str1, DEF_BCOMM) || strcmp (pair->str2, DEF_ECOMM)) + if (STRNEQ (pair->str1, DEF_BCOMM) || STRNEQ (pair->str2, DEF_ECOMM)) { xfprintf (file, "C%zu,%zu\n", pair->len1, pair->len2); produce_mem_dump (file, pair->str1, pair->len1); |