Savannah Git Hosting - m4.git/commitdiff

maint: prefer STREQ/STRNEQ to strcmp contortions.

2013年9月18日 06:38:55 +0000 (13:38 +0700)

committer Gary V. Vaughan <gary@gnu.org>

2013年9月18日 06:38:55 +0000 (13:38 +0700)

* 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>

m4/m4private.h patch | blob | history

m4/path.c patch | blob | history

src/freeze.c patch | blob | history

diff --git a/m4/m4private.h b/m4/m4private.h

index 4833d39a27b6bc7daf24658b67c9c8197d1f1251..7dc207acf47e377fff3e4ecddc01c8577d2c5ace 100644 (file)

--- 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

diff --git a/m4/path.c b/m4/path.c

index 2d5e3709d08e79eded5cdec2f30e25a5bfee8e2d..1de64376fcb5ae9a2744fd47ed832c558c9d3907 100644 (file)

--- a/m4/path.c

+++ b/m4/path.c

@@ -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 e53995a6d1a1fab3a44013d2c43b9fdb1ae4740a..9f36e8ccf1ccac0f88b1626fdf5c04f44d136967 100644 (file)

--- 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);

GNU M4 source repository

RSS Atom