From: Jim Meyering <jim@meyering.net>
Date: Sat, 23 Jun 2007 08:11:25 +0000 (+0200)
Subject: Prefer "STREQ (a, b)" over "strcmp (a, b) == 0"; similar for != 0.
X-Git-Tag: v6.9.89~257
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=519d7a95a3f8103925aa84f9bdef326ce88d37cc;p=platform%2Fupstream%2Fcoreutils.git

Prefer "STREQ (a, b)" over "strcmp (a, b) == 0"; similar for != 0.
* src/base64.c (main): Likewise.
* src/install.c (setdefaultfilecon): Likewise.
* src/sort.c (main): Likewise.
* Makefile.maint (sc_prohibit_strcmp): New rule.
* .x-sc_prohibit_strcmp: New file, to list the few exceptions.
* Makefile.am (EXTRA_DIST): Add .x-sc_prohibit_strcmp.
---

diff --git a/.x-sc_prohibit_strcmp b/.x-sc_prohibit_strcmp
new file mode 100644
index 0000000..fdceaf0
--- /dev/null
+++ b/.x-sc_prohibit_strcmp
@@ -0,0 +1,2 @@
+^src/system\.h
+ChangeLog
diff --git a/ChangeLog b/ChangeLog
index aab0bc2..7244fa8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2007-06-23  Jim Meyering  <jim@meyering.net>
+
+	Prefer "STREQ (a, b)" over "strcmp (a, b) == 0"; similar for != 0.
+	* src/base64.c (main): Likewise.
+	* src/install.c (setdefaultfilecon): Likewise.
+	* src/sort.c (main): Likewise.
+	* Makefile.maint (sc_prohibit_strcmp): New rule.
+	* .x-sc_prohibit_strcmp: New file, to list the few exceptions.
+	* Makefile.am (EXTRA_DIST): Add .x-sc_prohibit_strcmp.
+
 2007-06-22  Paul Eggert  <eggert@cs.ucla.edu>
 
 	* NEWS: seq no longer mishandles obvious cases like
diff --git a/Makefile.am b/Makefile.am
index 1a63077..5341edc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,6 +26,7 @@ EXTRA_DIST = Makefile.cfg Makefile.maint GNUmakefile \
   .x-po-check \
   .x-sc_file_system .x-sc_obsolete_symbols \
   .x-sc_prohibit_atoi_atof \
+  .x-sc_prohibit_strcmp \
   .x-sc_require_config_h \
   .x-sc_space_tab .x-sc_sun_os_names \
   .x-sc_trailing_blank \
diff --git a/Makefile.maint b/Makefile.maint
index bb666a4..04efbc2 100644
--- a/Makefile.maint
+++ b/Makefile.maint
@@ -125,6 +125,13 @@ sc_prohibit_atoi_atof:
 	  { echo '$(ME): do not use *scan''f, ato''f, ato''i, ato''l, ato''ll, ato''q, or ss''canf'	\
 		1>&2; exit 1; } || :
 
+# Use STREQ rather than comparing strcmp == 0, or != 0.
+sc_prohibit_strcmp:
+	@grep -nE '! *str''cmp \(|\<str''cmp \([^)]+\) *==' \
+	    $$($(CVS_LIST_EXCEPT)) && \
+	  { echo '$(ME): use STREQ in place of the above uses of str''cmp' \
+		1>&2; exit 1; } || :
+
 # Using EXIT_SUCCESS as the first argument to error is misleading,
 # since when that parameter is 0, error does not exit.  Use `0' instead.
 sc_error_exit_success:
diff --git a/src/base64.c b/src/base64.c
index 4a27827..3a38ccf 100644
--- a/src/base64.c
+++ b/src/base64.c
@@ -296,7 +296,7 @@ main (int argc, char **argv)
   else
     infile = "-";
 
-  if (strcmp (infile, "-") == 0)
+  if (STREQ (infile, "-"))
     input_fh = stdin;
   else
     {
@@ -312,7 +312,7 @@ main (int argc, char **argv)
 
   if (fclose (input_fh) == EOF)
     {
-      if (strcmp (infile, "-") == 0)
+      if (STREQ (infile, "-"))
 	error (EXIT_FAILURE, errno, _("closing standard input"));
       else
 	error (EXIT_FAILURE, errno, "%s", infile);
diff --git a/src/install.c b/src/install.c
index 39d5149..566c93c 100644
--- a/src/install.c
+++ b/src/install.c
@@ -217,7 +217,7 @@ setdefaultfilecon (char const *file)
   /* If there's an error determining the context, or it has none,
      return to allow default context */
   if ((matchpathcon (file, st.st_mode, &scontext) != 0) ||
-      (strcmp (scontext, "<<none>>") == 0))
+      STREQ (scontext, "<<none>>"))
     {
       if (scontext != NULL)
 	freecon (scontext);
diff --git a/src/sort.c b/src/sort.c
index ff021aa..7290172 100644
--- a/src/sort.c
+++ b/src/sort.c
@@ -2930,7 +2930,7 @@ main (int argc, char **argv)
 	  break;
 
 	case COMPRESS_PROGRAM_OPTION:
-	  if (compress_program && strcmp (compress_program, optarg) != 0)
+	  if (compress_program && !STREQ (compress_program, optarg))
 	    error (SORT_FAILURE, 0, _("multiple compress programs specified"));
 	  compress_program = optarg;
 	  break;