From eff64df12f193677895b3492ba2d093902cf7a70 Mon Sep 17 00:00:00 2001 From: Thien-Thi Nguyen Date: Sat, 8 May 2004 16:26:12 +0000 Subject: [PATCH] (GOOD, BAD): Delete macros. Throughout, replace w/ `EXIT_SUCCESS' and `EXIT_FAILURE', respectively. (main): Use `EXIT_SUCCESS' or `EXIT_FAILURE' for return value. --- lib-src/ChangeLog | 8 ++++++++ lib-src/b2m.c | 20 ++++++-------------- lib-src/etags.c | 29 +++++++++++------------------ 3 files changed, 25 insertions(+), 32 deletions(-) diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index bd0ff556081..06faeabece6 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,11 @@ +2004-05-08 Thien-Thi Nguyen + + * b2m.c (GOOD, BAD): Delete macros. Throughout, + replace w/ `EXIT_SUCCESS' and `EXIT_FAILURE', respectively. + (main): Use `EXIT_SUCCESS' or `EXIT_FAILURE' for return value. + + * etags.c: Likewise. + 2004-05-07 Thien-Thi Nguyen * b2m.c: Properly spell the name of Emacs. diff --git a/lib-src/b2m.c b/lib-src/b2m.c index 05caa1424e0..f1394fdda74 100644 --- a/lib-src/b2m.c +++ b/lib-src/b2m.c @@ -39,15 +39,6 @@ #undef FALSE #define FALSE 0 -/* Exit codes for success and failure. */ -#ifdef VMS -#define GOOD 1 -#define BAD 0 -#else -#define GOOD 0 -#define BAD 1 -#endif - #define streq(s,t) (strcmp (s, t) == 0) #define strneq(s,t,n) (strncmp (s, t, n) == 0) @@ -124,18 +115,18 @@ main (argc, argv) case 'V': printf ("%s (GNU Emacs %s)\n", "b2m", VERSION); puts ("b2m is in the public domain."); - exit (GOOD); + exit (EXIT_SUCCESS); case 'h': fprintf (stderr, "Usage: %s unixmailbox\n", progname); - exit (GOOD); + exit (EXIT_SUCCESS); } } if (optind != argc) { fprintf (stderr, "Usage: %s unixmailbox\n", progname); - exit (GOOD); + exit (EXIT_SUCCESS); } labels_saved = printing = header = FALSE; @@ -191,7 +182,7 @@ main (argc, argv) puts (data.buffer); } - return 0; + return EXIT_SUCCESS; } @@ -298,6 +289,7 @@ fatal (message) char *message; { fprintf (stderr, "%s: %s\n", progname, message); - exit (BAD); + exit (EXIT_FAILURE); } +/* b2m.c ends here */ diff --git a/lib-src/etags.c b/lib-src/etags.c index 8227cfb07cb..86d583fdf38 100644 --- a/lib-src/etags.c +++ b/lib-src/etags.c @@ -161,15 +161,6 @@ char pot_etags_version[] = "@(#) pot revision number is 14.21"; # define CTAGS FALSE #endif -/* Exit codes for success and failure. */ -#ifdef VMS -# define GOOD 1 -# define BAD 0 -#else -# define GOOD 0 -# define BAD 1 -#endif - #define streq(s,t) (assert((s)!=NULL || (t)!=NULL), !strcmp (s, t)) #define strneq(s,t,n) (assert((s)!=NULL || (t)!=NULL), !strncmp (s, t, n)) @@ -627,7 +618,7 @@ print_version () puts ("Copyright (C) 1999 Free Software Foundation, Inc. and Ken Arnold"); puts ("This program is distributed under the same terms as Emacs"); - exit (GOOD); + exit (EXIT_SUCCESS); } static void @@ -764,7 +755,7 @@ Relative ones are stored relative to the output file's directory."); puts (""); puts ("Report bugs to bug-gnu-emacs@gnu.org"); - exit (GOOD); + exit (EXIT_SUCCESS); } @@ -1180,7 +1171,7 @@ main (argc, argv) fprintf (tagf, "\f\n%s,include\n", *included_files++); fclose (tagf); - exit (GOOD); + exit (EXIT_SUCCESS); } /* If CTAGS, we are here. process_file did not write the tags yet, @@ -1190,7 +1181,7 @@ main (argc, argv) put_entries (head); free_tree (head); head = NULL; - exit (GOOD); + exit (EXIT_SUCCESS); } if (update) @@ -1203,7 +1194,7 @@ main (argc, argv) sprintf (cmd, "mv %s OTAGS;fgrep -v '\t%s\t' OTAGS >%s;rm OTAGS", tagfile, argbuffer[i].what, tagfile); - if (system (cmd) != GOOD) + if (system (cmd) != EXIT_SUCCESS) fatal ("failed to execute shell command", (char *)NULL); } append_to_tagfile = TRUE; @@ -1223,7 +1214,7 @@ main (argc, argv) sprintf (cmd, "sort %s -o %s", tagfile, tagfile); exit (system (cmd)); } - return GOOD; + return EXIT_SUCCESS; } @@ -5526,7 +5517,7 @@ fatal (s1, s2) char *s1, *s2; { error (s1, s2); - exit (BAD); + exit (EXIT_FAILURE); } static void @@ -5534,7 +5525,7 @@ pfatal (s1) char *s1; { perror (s1); - exit (BAD); + exit (EXIT_FAILURE); } static void @@ -5548,7 +5539,7 @@ suggest_asking_for_help () "-h" #endif ); - exit (BAD); + exit (EXIT_FAILURE); } /* Print error message. `s1' is printf control string, `s2' is arg for it. */ @@ -5819,3 +5810,5 @@ xrealloc (ptr, size) fatal ("virtual memory exhausted", (char *)NULL); return result; } + +/* etags.c ends here */ -- 2.11.4.GIT