From: Sami Kerola <kerolasa@iki.fi>
Date: Tue, 16 Aug 2016 12:14:11 +0000 (+0100)
Subject: readability: always use EXIT_* definitions from stdlib.h
X-Git-Tag: v0.88~38^2^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=11c3ec7ae3bbc167bca4e774cf4931a5419a99ed;p=thirdparty%2Fmtr.git

readability: always use EXIT_* definitions from stdlib.h
---

diff --git a/display.c b/display.c
index f006b73..8e272a6 100644
--- a/display.c
+++ b/display.c
@@ -49,7 +49,7 @@ extern int DisplayMode;
 #define gtk_close()
 #define gtk_redraw()
 #define gtk_keyaction() 0
-#define gtk_loop() {fprintf (stderr, "No GTK support. Sorry.\n"); exit (1); } 
+#define gtk_loop() {fprintf (stderr, "No GTK support. Sorry.\n"); exit(EXIT_FAILURE); }
 #else
 #include "mtr-gtk.h"
 #endif
diff --git a/dns.c b/dns.c
index f531e73..f3a4df9 100644
--- a/dns.c
+++ b/dns.c
@@ -157,19 +157,19 @@ void dns_open(void)
  
   if (pipe (todns) < 0) {
     perror ("can't make a pipe for DNS process");
-    exit (-1);
+    exit(EXIT_FAILURE);
   }
 
   if (pipe (fromdns) < 0) {
     perror ("can't make a pipe for DNS process");
-    exit (-1);
+    exit(EXIT_FAILURE);
   }
   fflush (stdout);
   pid = fork ();
   //pid = 1;
   if (pid < 0) {
     perror ("can't fork for DNS process");
-    exit (-1);
+    exit(EXIT_FAILURE);
   }
   if (pid == 0) {
     char buf[2048];
@@ -179,7 +179,7 @@ void dns_open(void)
     // Automatically reap children. 
     if (signal(SIGCHLD, SIG_IGN) == SIG_ERR) {
       perror("signal");
-      exit(1);
+      exit(EXIT_FAILURE);
     }
 
 #if 0
@@ -225,10 +225,10 @@ void dns_open(void)
           if (rv < 0) perror ("write DNS lookup result");
         }
 
-        exit (0);
+        exit(EXIT_SUCCESS);
       }
     }
-    exit (0);
+    exit(EXIT_SUCCESS);
   } else {
      int flags;
 
diff --git a/getopt.c b/getopt.c
index e2f8758..b7d7d04 100644
--- a/getopt.c
+++ b/getopt.c
@@ -760,7 +760,7 @@ main (argc, argv)
       printf ("\n");
     }
 
-  exit (0);
+  exit(EXIT_SUCCESS);
 }
 
 #endif /* TEST */
diff --git a/getopt1.c b/getopt1.c
index 0a2d405..6dd1183 100644
--- a/getopt1.c
+++ b/getopt1.c
@@ -173,7 +173,7 @@ main (argc, argv)
       printf ("\n");
     }
 
-  exit (0);
+  exit(EXIT_SUCCESS);
 }
 
 #endif /* TEST */
diff --git a/mtr.c b/mtr.c
index 72c9c2f..4fc7ee6 100644
--- a/mtr.c
+++ b/mtr.c
@@ -435,11 +435,11 @@ void parse_arg (int argc, char **argv)
       WaitTime = atof (optarg);
       if (WaitTime <= 0.0) {
 	fprintf (stderr, "mtr: wait time must be positive\n");
-	exit (1);
+	exit(EXIT_FAILURE);
       }
       if (getuid() != 0 && WaitTime < 1.0) {
         fprintf (stderr, "non-root users cannot request an interval < 1.0 seconds\r\n");
-	exit (1);
+	exit(EXIT_FAILURE);
       }
       break;
     case 'f':
@@ -476,12 +476,12 @@ void parse_arg (int argc, char **argv)
       /* Check option before passing it on to fld_active. */
       if (strlen (optarg) > MAXFLD) {
 	fprintf (stderr, "Too many fields: %s\n", optarg);
-        exit (1);
+        exit(EXIT_FAILURE);
       }
       for (i=0; optarg[i]; i++) {
         if(!strchr (available_options, optarg[i])) {
           fprintf (stderr, "Unknown field identifier: %c\n", optarg[i]);
-          exit (1);
+          exit(EXIT_FAILURE);
         }
       }
       strcpy ((char*)fld_active, optarg);
@@ -495,7 +495,7 @@ void parse_arg (int argc, char **argv)
       GraceTime = atof (optarg);
       if (GraceTime <= 0.0) {
         fprintf (stderr, "mtr: wait time must be positive\n");
-        exit (1);
+        exit(EXIT_FAILURE);
       }
       break;
     case 'Q':
@@ -655,13 +655,13 @@ int main(int argc, char **argv)
   /*  Now drop to user permissions  */
   if (setgid(getgid()) || setuid(getuid())) {
     fprintf (stderr, "mtr: Unable to drop permissions.\n");
-    exit(1);
+    exit(EXIT_FAILURE);
   }
 
   /*  Double check, just in case  */
   if ((geteuid() != getuid()) || (getegid() != getgid())) {
     fprintf (stderr, "mtr: Unable to drop permissions.\n");
-    exit(1);
+    exit(EXIT_FAILURE);
   }
 
   /* reset the random seed */
@@ -691,7 +691,7 @@ int main(int argc, char **argv)
 
   if (PrintVersion) {
     printf ("mtr " PACKAGE_VERSION "\n");
-    exit(0);
+    exit(EXIT_SUCCESS);
   }
 
   if (PrintHelp) {
diff --git a/select.c b/select.c
index 522d635..c9f768d 100644
--- a/select.c
+++ b/select.c
@@ -179,7 +179,7 @@ void select_loop(void) {
 
     if (rv < 0) {
       perror ("Select failed");
-      exit (1);
+      exit(EXIT_FAILURE);
     }
     anyset = 0;