From: Jim Meyering <meyering@redhat.com>
Date: Fri, 30 Oct 2009 18:52:17 +0000 (+0100)
Subject: build: accommodate new syntax-check test
X-Git-Tag: v1.3.14~1
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=8dbccc10a67b378f389e2a49a9de4ea3b0659e5c;p=debian%2Fgzip

build: accommodate new syntax-check test

* amiga/tailor.c (_expand_args): Change each of three uses of
"exit(20)" to "exit(EXIT_FAILURE)".
* sample/add.c: Include <stdlib.h>.
(main): Use EXIT_FAILURE and EXIT_SUCCESS, not 1 and 0.
* sample/sub.c (main): Likewise.
* sample/zread.c (main): Likewise.
---

diff --git a/amiga/tailor.c b/amiga/tailor.c
index 5084774..9207999 100644
--- a/amiga/tailor.c
+++ b/amiga/tailor.c
@@ -116,7 +116,7 @@ void _expand_args (oargc, oargv)
               {
                 expand_next_file (NULL);
                 fprintf (stderr,"Too many files.\n");
-                exit (20);
+                exit (EXIT_FAILURE);
               }
             else
               {
@@ -134,7 +134,7 @@ void _expand_args (oargc, oargv)
         if (argc >= MAXARGS)
           {
             fprintf (stderr,"Too many files.\n");
-            exit (20);
+            exit (EXIT_FAILURE);
           }
         else
           {
@@ -146,7 +146,7 @@ void _expand_args (oargc, oargv)
   *oargv = argv;
   if (no_match_at_all && contains_wildcards) {
     fprintf (stderr,"No match.\n");
-    exit (20);
+    exit (EXIT_FAILURE);
   }
 }
 
diff --git a/sample/add.c b/sample/add.c
index cbde915..cadbc3a 100644
--- a/sample/add.c
+++ b/sample/add.c
@@ -8,6 +8,7 @@
 
 #include <config.h>
 #include <stdio.h>
+#include <stdlib.h>
 
 #define MAGIC1    'S' /* sub data */
 #define MAGIC2    26  /* ^Z */
@@ -25,18 +26,18 @@ int main()
   if (getchar() != MAGIC1 || getchar() != MAGIC2)
   {
     fputs("add: input stream not made by sub\n", stderr);
-    exit(1);
+    exit(EXIT_FAILURE);
   }
 
   /* get number of differences from data */
   if ((n = getchar()) == EOF || (i = getchar()) == EOF) {
     fputs("add: unexpected end of file\n", stderr);
-    exit(1);
+    exit(EXIT_FAILURE);
   }
   n += (i<<8);
   if (n <= 0 || n > MAX_DIST) {
     fprintf(stderr, "add: incorrect distance %d\n", n);
-    exit(1);
+    exit(EXIT_FAILURE);
   }
 
   /* initialize last byte */
@@ -53,6 +54,6 @@ int main()
     if (i == n)			/* cycle on n differences */
       i = 0;
   }
-  exit(0);
+  exit(EXIT_SUCCESS);
   return 0;			/* avoid warning */
 }
diff --git a/sample/sub.c b/sample/sub.c
index 7ac120c..a06cc9b 100644
--- a/sample/sub.c
+++ b/sample/sub.c
@@ -35,6 +35,7 @@
 
 #include <config.h>
 #include <stdio.h>
+#include <stdlib.h>
 
 #define MAGIC1    'S' /* sub data */
 #define MAGIC2    26  /* ^Z */
@@ -55,7 +56,7 @@ int main(argc, argv)
   if (argc > 2)
   {
     fputs("sub: only one argument needed--# of differences\n", stderr);
-    exit(1);
+    exit(EXIT_FAILURE);
   }
   if (argc > 1)
     n = atoi(argv[1]);
@@ -63,7 +64,7 @@ int main(argc, argv)
   if (n < 0) n = -n;	/* tolerate "sub -2" */
   if (n == 0 || n > MAX_DIST) {
     fputs("sub: incorrect distance\n", stderr);
-    exit(1);
+    exit(EXIT_FAILURE);
   }
 
   /* initialize last byte */
@@ -84,6 +85,6 @@ int main(argc, argv)
     if (i == n)				/* cycle on n differences */
       i = 0;
   }
-  exit(0);
+  exit(EXIT_SUCCESS);
   return 0; /* avoid warning */
 }
diff --git a/sample/zread.c b/sample/zread.c
index 12c5a35..8492dc9 100644
--- a/sample/zread.c
+++ b/sample/zread.c
@@ -1,5 +1,6 @@
 #include <config.h>
 #include <stdio.h>
+#include <stdlib.h>
 
 /* Trivial example of reading a gzip'ed file or gzip'ed standard input
  * using stdio functions fread(), getc(), etc... fseek() is not supported.
@@ -20,7 +21,7 @@ int main(argc, argv)
 
     if (argc < 1 || argc > 2) {
 	fprintf(stderr, "usage: %s [file[.gz]]\n", argv[0]);
-	exit(1);
+	exit(EXIT_FAILURE);
     }
     strcpy(cmd, "gzip -dc ");  /* use "gzip -c" for zwrite */
     if (argc == 2) {
@@ -29,13 +30,13 @@ int main(argc, argv)
     infile = popen(cmd, "r");  /* use "w" for zwrite */
     if (infile == NULL) {
 	fprintf(stderr, "%s: popen('%s', 'r') failed\n", argv[0], cmd);
-	exit(1);
+	exit(EXIT_FAILURE);
     }
     /* Read one byte using getc: */
     n = getc(infile);
     if (n == EOF) {
 	pclose(infile);
-	exit(0);
+	exit(EXIT_SUCCESS);
     }
     putchar(n);
 
@@ -47,8 +48,8 @@ int main(argc, argv)
     }
     if (pclose(infile) != 0) {
 	fprintf(stderr, "%s: pclose failed\n", argv[0]);
-	exit(1);
+	exit(EXIT_FAILURE);
     }
-    exit(0);
+    exit(EXIT_SUCCESS);
     return 0; /* just to make compiler happy */
 }