Use EXIT_SUCCESS and EXIT_FAILURE

Instead of randomly using -1 or 1 as a failure status, properly utilize
the EXIT_FAILURE define that's platform specific (as it should be).

(cherry picked from commit76997983fde02d9c32aa23bda30b65f1ebd4178c)

diff --git a/bin/check/named-checkconf.c b/bin/check/named-checkconf.c
index fd7cfa53bf21a8331ad3876bcbd653ad8f818776..cc146ecd9df14ccade8bc8531e438db2337ad212 100644 (file)
--- a/bin/check/named-checkconf.c
+++ b/bin/check/named-checkconf.c
@@ -67,7 +67,7 @@ usage(void) {
                "usage: %s [-chijlvz] [-p [-x]] [-t directory] "
                "[named.conf]\n",
                program);
-       exit(1);
+       exit(EXIT_SUCCESS);
 }
 
 /*% directory callback */
@@ -573,7 +573,7 @@ output(void *closure, const char *text, int textlen) {
        UNUSED(closure);
        if (fwrite(text, 1, textlen, stdout) != (size_t)textlen) {
                perror("fwrite");
-               exit(1);
+               exit(EXIT_FAILURE);
        }
 }
 
@@ -653,7 +653,7 @@ main(int argc, char **argv) {
                        if (result != ISC_R_SUCCESS) {
                                fprintf(stderr, "isc_dir_chroot: %s\n",
                                        isc_result_totext(result));
-                               exit(1);
+                               exit(EXIT_FAILURE);
                        }
                        break;
 
@@ -663,7 +663,7 @@ main(int argc, char **argv) {
 
                case 'v':
                        printf("%s\n", PACKAGE_VERSION);
-                       exit(0);
+                       exit(EXIT_SUCCESS);
 
                case 'x':
                        flags |= CFG_PRINTER_XKEY;
@@ -688,17 +688,17 @@ main(int argc, char **argv) {
                default:
                        fprintf(stderr, "%s: unhandled option -%c\n", program,
                                isc_commandline_option);
-                       exit(1);
+                       exit(EXIT_FAILURE);
                }
        }
 
        if (((flags & CFG_PRINTER_XKEY) != 0) && !print) {
                fprintf(stderr, "%s: -x cannot be used without -p\n", program);
-               exit(1);
+               exit(EXIT_FAILURE);
        }
        if (print && list_zones) {
                fprintf(stderr, "%s: -l cannot be used with -p\n", program);
-               exit(1);
+               exit(EXIT_FAILURE);
        }
 
        if (isc_commandline_index + 1 < argc) {
@@ -723,7 +723,7 @@ main(int argc, char **argv) {
        if (cfg_parse_file(parser, conffile, &cfg_type_namedconf, &config) !=
            ISC_R_SUCCESS)
        {
-               exit(1);
+               exit(EXIT_FAILURE);
        }
 
        result = bind9_check_namedconf(config, loadplugins, nodeprecate, logc,

diff --git a/bin/check/named-checkzone.c b/bin/check/named-checkzone.c
index 6090d24282b1bca9cd28707270b47f0d5dbf6834..b72a0ce4b0c478ac70e15e3d9c96cd4604533c40 100644 (file)
--- a/bin/check/named-checkzone.c
+++ b/bin/check/named-checkzone.c
@@ -356,7 +356,7 @@ main(int argc, char **argv) {
 
                case 'v':
                        printf("%s\n", PACKAGE_VERSION);
-                       exit(0);
+                       exit(EXIT_SUCCESS);
 
                case 'w':
                        workdir = isc_commandline_argument;

diff --git a/bin/confgen/rndc-confgen.c b/bin/confgen/rndc-confgen.c
index 817929544e6c98dd24984e6af49032d305b35b47..e8d51b9d23eeafb8eb8d22839c4b5499259b5bbb 100644 (file)
--- a/bin/confgen/rndc-confgen.c
+++ b/bin/confgen/rndc-confgen.c
@@ -147,7 +147,8 @@ main(int argc, char **argv) {
                        keyfile = isc_commandline_argument;
                        break;
                case 'h':
-                       usage(0);
+                       usage(EXIT_SUCCESS);
+                       break;
                case 'k':
                case 'y': /* Compatible with rndc -y. */
                        keyname = isc_commandline_argument;
@@ -193,15 +194,15 @@ main(int argc, char **argv) {
                        if (isc_commandline_option != '?') {
                                fprintf(stderr, "%s: invalid argument -%c\n",
                                        program, isc_commandline_option);
-                               usage(1);
+                               usage(EXIT_FAILURE);
                        } else {
-                               usage(0);
+                               usage(EXIT_SUCCESS);
                        }
                        break;
                default:
                        fprintf(stderr, "%s: unhandled option -%c\n", program,
                                isc_commandline_option);
-                       exit(1);
+                       exit(EXIT_FAILURE);
                }
        }
 
@@ -210,7 +211,7 @@ main(int argc, char **argv) {
        POST(argv);
 
        if (argc > 0) {
-               usage(1);
+               usage(EXIT_FAILURE);
        }
 
        if (alg == DST_ALG_HMACMD5) {

diff --git a/bin/confgen/tsig-keygen.c b/bin/confgen/tsig-keygen.c
index b44f1a915859368bad62de3a9f7fdc561c1c548e..6d6f7664146055ebf401cf6f1967d78d8faad277 100644 (file)
--- a/bin/confgen/tsig-keygen.c
+++ b/bin/confgen/tsig-keygen.c
@@ -139,13 +139,13 @@ main(int argc, char **argv) {
                        keysize = alg_bits(alg);
                        break;
                case 'h':
-                       usage(0);
+                       usage(EXIT_SUCCESS);
                case 'k':
                case 'y':
                        if (progmode == progmode_confgen) {
                                keyname = isc_commandline_argument;
                        } else {
-                               usage(1);
+                               usage(EXIT_FAILURE);
                        }
                        break;
                case 'M':
@@ -158,7 +158,7 @@ main(int argc, char **argv) {
                        if (progmode == progmode_confgen) {
                                quiet = true;
                        } else {
-                               usage(1);
+                               usage(EXIT_FAILURE);
                        }
                        break;
                case 'r':
@@ -168,29 +168,29 @@ main(int argc, char **argv) {
                        if (progmode == progmode_confgen) {
                                self_domain = isc_commandline_argument;
                        } else {
-                               usage(1);
+                               usage(EXIT_FAILURE);
                        }
                        break;
                case 'z':
                        if (progmode == progmode_confgen) {
                                zone = isc_commandline_argument;
                        } else {
-                               usage(1);
+                               usage(EXIT_FAILURE);
                        }
                        break;
                case '?':
                        if (isc_commandline_option != '?') {
                                fprintf(stderr, "%s: invalid argument -%c\n",
                                        program, isc_commandline_option);
-                               usage(1);
+                               usage(EXIT_FAILURE);
                        } else {
-                               usage(0);
+                               usage(EXIT_SUCCESS);
                        }
                        break;
                default:
                        fprintf(stderr, "%s: unhandled option -%c\n", program,
                                isc_commandline_option);
-                       exit(1);
+                       exit(EXIT_FAILURE);
                }
        }
 
@@ -201,11 +201,11 @@ main(int argc, char **argv) {
        POST(argv);
 
        if (self_domain != NULL && zone != NULL) {
-               usage(1); /* -s and -z cannot coexist */
+               usage(EXIT_FAILURE); /* -s and -z cannot coexist */
        }
 
        if (argc > isc_commandline_index) {
-               usage(1);
+               usage(EXIT_FAILURE);
        }
 
        /* Use canonical algorithm name */

diff --git a/bin/delv/delv.c b/bin/delv/delv.c
index d47b99aac04bf9f8e9e464e08f1bdc685eac6952..c7506295170467cd19d2b11a42b1836c73113498 100644 (file)
--- a/bin/delv/delv.c
+++ b/bin/delv/delv.c
@@ -205,7 +205,7 @@ usage(void) {
                "process)\n"
                "                 +[no]yaml           (Present the results as "
                "YAML)\n");
-       exit(1);
+       exit(EXIT_FAILURE);
 }
 
 noreturn static void
@@ -1132,7 +1132,7 @@ plus_option(char *option) {
                        if (state) {
                                fprintf(stderr, "Invalid option: "
                                                "+dlv is obsolete\n");
-                               exit(1);
+                               exit(EXIT_FAILURE);
                        }
                        break;
                case 'n': /* dnssec */
@@ -1329,7 +1329,7 @@ dash_option(char *option, char *next, bool *open_type_class) {
                        break;
                case 'h':
                        usage();
-                       exit(0);
+                       exit(EXIT_SUCCESS);
                case 'i':
                        no_sigs = true;
                        root_validation = false;
@@ -1339,7 +1339,7 @@ dash_option(char *option, char *next, bool *open_type_class) {
                        break;
                case 'v':
                        fprintf(stderr, "delv %s\n", PACKAGE_VERSION);
-                       exit(0);
+                       exit(EXIT_SUCCESS);
                default:
                        UNREACHABLE();
                }
@@ -1472,7 +1472,7 @@ dash_option(char *option, char *next, bool *open_type_class) {
                        typeset = true;
                } else {
                        fprintf(stderr, "Invalid IP address %s\n", value);
-                       exit(1);
+                       exit(EXIT_FAILURE);
                }
                return (value_from_next);
        invalid_option:

diff --git a/bin/dig/dig.c b/bin/dig/dig.c
index 04b3a9ba988239580c89048a80795c535ca54cfc..d4867cc28278459f75bf52ac1a008cb3d9efa0b9 100644 (file)
--- a/bin/dig/dig.c
+++ b/bin/dig/dig.c
@@ -121,7 +121,7 @@ usage(void) {
        print_usage(stderr);
        fprintf(stderr, "\nUse \"dig -h\" (or \"dig -h | more\") "
                        "for complete list of options\n");
-       exit(1);
+       exit(EXIT_FAILURE);
 }
 #endif /* if TARGET_OS_IPHONE */
 
@@ -2278,7 +2278,7 @@ dash_option(char *option, char *next, dig_lookup_t **lookup,
                        break;
                case 'h':
                        help();
-                       exit(0);
+                       exit(EXIT_SUCCESS);
                        break;
                case 'i':
                        /* deprecated */
@@ -2298,7 +2298,7 @@ dash_option(char *option, char *next, dig_lookup_t **lookup,
                        break;
                case 'v':
                        version();
-                       exit(0);
+                       exit(EXIT_SUCCESS);
                        break;
                }
                if (strlen(option) > 1U) {
@@ -2507,7 +2507,7 @@ dash_option(char *option, char *next, dig_lookup_t **lookup,
                        ISC_LIST_APPEND(lookup_list, *lookup, link);
                } else {
                        fprintf(stderr, "Invalid IP address %s\n", value);
-                       exit(1);
+                       exit(EXIT_FAILURE);
                }
                return (value_from_next);
        invalid_option:

diff --git a/bin/dig/host.c b/bin/dig/host.c
index 57c1fb492da0b599b03acdaca347b2fcebb8cd3d..c8ab80492349d691446c8fe2253d1132dfca6e07 100644 (file)
--- a/bin/dig/host.c
+++ b/bin/dig/host.c
@@ -134,7 +134,7 @@ show_usage(void) {
                "       -W specifies how long to wait for a reply\n"
                "       -4 use IPv4 query transport only\n"
                "       -6 use IPv6 query transport only\n");
-       exit(1);
+       exit(EXIT_FAILURE);
 }
 
 static void
@@ -663,7 +663,7 @@ pre_parse_args(int argc, char **argv) {
                        break;
                case 'V':
                        version();
-                       exit(0);
+                       exit(EXIT_SUCCESS);
                        break;
                case 'w':
                        break;

diff --git a/bin/dig/nslookup.c b/bin/dig/nslookup.c
index d8e753725545319ff003aa4ecb91b6ea6316dd55..6e4082ac15cb790de9425b7e5c418301e9c6045a 100644 (file)
--- a/bin/dig/nslookup.c
+++ b/bin/dig/nslookup.c
@@ -870,7 +870,7 @@ usage(void) {
                        "'host' using default server\n");
        fprintf(stderr, "   nslookup [-opt ...] host server # just look up "
                        "'host' using 'server'\n");
-       exit(1);
+       exit(EXIT_FAILURE);
 }
 
 static void
@@ -883,7 +883,7 @@ parse_args(int argc, char **argv) {
                if (argv[0][0] == '-') {
                        if (strncasecmp(argv[0], "-ver", 4) == 0) {
                                version();
-                               exit(0);
+                               exit(EXIT_SUCCESS);
                        } else if (argv[0][1] != 0) {
                                setoption(&argv[0][1]);
                        } else {

diff --git a/bin/dnssec/dnssec-cds.c b/bin/dnssec/dnssec-cds.c
index 06b1f8c90bd127f91c9778672c81df7c40c03594..673cabed4b724d8c05be4a6dd655a943145795ae 100644 (file)
--- a/bin/dnssec/dnssec-cds.c
+++ b/bin/dnssec/dnssec-cds.c
@@ -1059,7 +1059,7 @@ usage(void) {
                        "    -T <ttl>           TTL of DS records\n"
                        "    -V                 print version\n"
                        "    -v <verbosity>\n");
-       exit(1);
+       exit(EXIT_FAILURE);
 }
 
 static void
@@ -1357,5 +1357,6 @@ main(int argc, char *argv[]) {
 cleanup:
        print_mem_stats = true;
        cleanup();
-       exit(0);
+
+       return (0);
 }

diff --git a/bin/dnssec/dnssec-dsfromkey.c b/bin/dnssec/dnssec-dsfromkey.c
index 42aa9e5c7b0db565c540642ab4c6bf7420ee3277..bf0530c12300ded9d9e4675e75fd76d9543005f8 100644 (file)
--- a/bin/dnssec/dnssec-dsfromkey.c
+++ b/bin/dnssec/dnssec-dsfromkey.c
@@ -354,7 +354,7 @@ usage(void) {
                        "    -V: print version information\n");
        fprintf(stderr, "Output: DS or CDS RRs\n");
 
-       exit(-1);
+       exit(EXIT_FAILURE);
 }
 
 int
@@ -453,7 +453,7 @@ main(int argc, char **argv) {
                default:
                        fprintf(stderr, "%s: unhandled option -%c\n", program,
                                isc_commandline_option);
-                       exit(1);
+                       exit(EXIT_FAILURE);
                }
        }
 

diff --git a/bin/dnssec/dnssec-importkey.c b/bin/dnssec/dnssec-importkey.c
index 441f7c3f8b5993c9e295ffa14ec3f4967a615241..ca89fc9f4e60881ca70cd752b6b3e574cad019f1 100644 (file)
--- a/bin/dnssec/dnssec-importkey.c
+++ b/bin/dnssec/dnssec-importkey.c
@@ -290,7 +290,7 @@ usage(void) {
        fprintf(stderr, "    -D sync date/[+-]offset/none: set/unset "
                        "CDS and CDNSKEY deletion date\n");
 
-       exit(-1);
+       exit(EXIT_FAILURE);
 }
 
 int
@@ -397,7 +397,7 @@ main(int argc, char **argv) {
                default:
                        fprintf(stderr, "%s: unhandled option -%c\n", program,
                                isc_commandline_option);
-                       exit(1);
+                       exit(EXIT_FAILURE);
                }
        }
 

diff --git a/bin/dnssec/dnssec-keyfromlabel.c b/bin/dnssec/dnssec-keyfromlabel.c
index 53ca718784867a2a0b0c001625f97c4f1a773a42..cf207d33ff9f5a32f587bbf63c53c1ea17ed456b 100644 (file)
--- a/bin/dnssec/dnssec-keyfromlabel.c
+++ b/bin/dnssec/dnssec-keyfromlabel.c
@@ -103,7 +103,7 @@ usage(void) {
        fprintf(stderr, "     K<name>+<alg>+<id>.key, "
                        "K<name>+<alg>+<id>.private\n");
 
-       exit(-1);
+       exit(EXIT_FAILURE);
 }
 
 int
@@ -334,7 +334,7 @@ main(int argc, char **argv) {
                default:
                        fprintf(stderr, "%s: unhandled option -%c\n", program,
                                isc_commandline_option);
-                       exit(1);
+                       exit(EXIT_FAILURE);
                }
        }
 
@@ -619,7 +619,7 @@ main(int argc, char **argv) {
                fatal("failed to get key %s/%s: %s", namestr, algstr,
                      isc_result_totext(ret));
                UNREACHABLE();
-               exit(-1);
+               exit(EXIT_FAILURE);
        }
 
        /*

diff --git a/bin/dnssec/dnssec-keygen.c b/bin/dnssec/dnssec-keygen.c
index 3d77976faba76cd1b82c57083706931af9888b28..08686cfe055679904eb0859489096a7f9d89f8f8 100644 (file)
--- a/bin/dnssec/dnssec-keygen.c
+++ b/bin/dnssec/dnssec-keygen.c
@@ -209,7 +209,7 @@ usage(void) {
        fprintf(stderr, "     K<name>+<alg>+<id>.key, "
                        "K<name>+<alg>+<id>.private\n");
 
-       exit(-1);
+       exit(EXIT_FAILURE);
 }
 
 static void
@@ -1132,7 +1132,7 @@ main(int argc, char **argv) {
                default:
                        fprintf(stderr, "%s: unhandled option -%c\n", program,
                                isc_commandline_option);
-                       exit(1);
+                       exit(EXIT_FAILURE);
                }
        }
 

diff --git a/bin/dnssec/dnssec-revoke.c b/bin/dnssec/dnssec-revoke.c
index 93ee20cca20f36a51113060760e9d45f441ca54d..c3be1066ca51f24d68b2ca60e570f44aa6880c3b 100644 (file)
--- a/bin/dnssec/dnssec-revoke.c
+++ b/bin/dnssec/dnssec-revoke.c
@@ -59,7 +59,7 @@ usage(void) {
        fprintf(stderr, "     K<name>+<alg>+<new id>.key, "
                        "K<name>+<alg>+<new id>.private\n");
 
-       exit(-1);
+       exit(EXIT_FAILURE);
 }
 
 int
@@ -131,7 +131,7 @@ main(int argc, char **argv) {
                default:
                        fprintf(stderr, "%s: unhandled option -%c\n", program,
                                isc_commandline_option);
-                       exit(1);
+                       exit(EXIT_FAILURE);
                }
        }
 

diff --git a/bin/dnssec/dnssec-settime.c b/bin/dnssec/dnssec-settime.c
index 100ff88fad62fa292fe1451d39f677cea48e32f0..4df45125ca48fcfc4915e0480516245af4f6cc8e 100644 (file)
--- a/bin/dnssec/dnssec-settime.c
+++ b/bin/dnssec/dnssec-settime.c
@@ -102,7 +102,7 @@ usage(void) {
        fprintf(stderr, "     K<name>+<alg>+<new id>.key, "
                        "K<name>+<alg>+<new id>.private\n");
 
-       exit(-1);
+       exit(EXIT_FAILURE);
 }
 
 static void
@@ -539,7 +539,7 @@ main(int argc, char **argv) {
                default:
                        fprintf(stderr, "%s: unhandled option -%c\n", program,
                                isc_commandline_option);
-                       exit(1);
+                       exit(EXIT_FAILURE);
                }
        }
 

diff --git a/bin/dnssec/dnssec-signzone.c b/bin/dnssec/dnssec-signzone.c
index 41f1fc1a47d48dfc216befae2eebb536f45290a9..229e9efb8cdc3aaa5085fe0a54bd0c6b7284a71d 100644 (file)
--- a/bin/dnssec/dnssec-signzone.c
+++ b/bin/dnssec/dnssec-signzone.c
@@ -3311,7 +3311,7 @@ usage(void) {
        fprintf(stderr, "(default: all zone keys that have private keys)\n");
        fprintf(stderr, "\tkeyfile (Kname+alg+tag)\n");
 
-       exit(0);
+       exit(EXIT_FAILURE);
 }
 
 static void
@@ -3555,7 +3555,7 @@ main(int argc, char *argv[]) {
                        if (*endp != '\0') {
                                fprintf(stderr, "source serial number "
                                                "must be numeric");
-                               exit(1);
+                               exit(EXIT_FAILURE);
                        }
                        break;
 
@@ -3570,7 +3570,7 @@ main(int argc, char *argv[]) {
                        if (*endp != '\0') {
                                fprintf(stderr, "maximum TTL "
                                                "must be numeric");
-                               exit(1);
+                               exit(EXIT_FAILURE);
                        }
                        break;
 
@@ -3693,7 +3693,7 @@ main(int argc, char *argv[]) {
                default:
                        fprintf(stderr, "%s: unhandled option -%c\n", program,
                                isc_commandline_option);
-                       exit(1);
+                       exit(EXIT_FAILURE);
                }
        }
 
@@ -3799,7 +3799,7 @@ main(int argc, char *argv[]) {
                            rawversion > 1U)
                        {
                                fprintf(stderr, "unknown raw format version\n");
-                               exit(1);
+                               exit(EXIT_FAILURE);
                        }
                } else {
                        fatal("unknown file format: %s", outputformatstr);

diff --git a/bin/dnssec/dnssec-verify.c b/bin/dnssec/dnssec-verify.c
index 5f2f2d13e44f30194c1a3baf7b00c9f7fe085321..a2a849f6550e5b2d3edf6f6b8a157a93ee45f9a8 100644 (file)
--- a/bin/dnssec/dnssec-verify.c
+++ b/bin/dnssec/dnssec-verify.c
@@ -165,7 +165,7 @@ usage(void) {
        fprintf(stderr, "\t-x:\tDNSKEY record signed with KSKs only, "
                        "not ZSKs\n");
        fprintf(stderr, "\t-z:\tAll records signed with KSKs\n");
-       exit(0);
+       exit(EXIT_SUCCESS);
 }
 
 int
@@ -271,7 +271,7 @@ main(int argc, char *argv[]) {
                default:
                        fprintf(stderr, "%s: unhandled option -%c\n", program,
                                isc_commandline_option);
-                       exit(1);
+                       exit(EXIT_FAILURE);
                }
        }
 

diff --git a/bin/dnssec/dnssectool.c b/bin/dnssec/dnssectool.c
index 8250a127a46cd6a57ccf5689406684991b320754..d2812536d333995abb6912a65a463f22a9eec8b6 100644 (file)
--- a/bin/dnssec/dnssectool.c
+++ b/bin/dnssec/dnssectool.c
@@ -112,7 +112,7 @@ vbprintf(int level, const char *fmt, ...) {
 void
 version(const char *name) {
        fprintf(stderr, "%s %s\n", name, PACKAGE_VERSION);
-       exit(0);
+       exit(EXIT_SUCCESS);
 }
 
 void

diff --git a/bin/named/main.c b/bin/named/main.c
index eca30c6ab7d7717418372279a44400a2082644bb..843bf9e0babac8a8faa29aa5316df548b1d279e6 100644 (file)
--- a/bin/named/main.c
+++ b/bin/named/main.c
@@ -898,7 +898,7 @@ parse_command_line(int argc, char *argv[]) {
                        printf("# Built-in default values. "
                               "This is NOT the run-time configuration!\n");
                        printf("%s", named_config_getdefault());
-                       exit(0);
+                       exit(EXIT_SUCCESS);
                case 'd':
                        named_g_debuglevel = parse_int(isc_commandline_argument,
                                                       "debug "
@@ -963,10 +963,10 @@ parse_command_line(int argc, char *argv[]) {
                        break;
                case 'v':
                        printversion(false);
-                       exit(0);
+                       exit(EXIT_SUCCESS);
                case 'V':
                        printversion(true);
-                       exit(0);
+                       exit(EXIT_SUCCESS);
                case 'x':
                        /* Obsolete. No longer in use. Ignore. */
                        break;
@@ -985,7 +985,7 @@ parse_command_line(int argc, char *argv[]) {
                case '?':
                        usage();
                        if (isc_commandline_option == '?') {
-                               exit(0);
+                               exit(EXIT_SUCCESS);
                        }
                        p = strchr(NAMED_MAIN_ARGS, isc_commandline_option);
                        if (p == NULL || *++p != ':') {

diff --git a/bin/named/os.c b/bin/named/os.c
index 0222abb7c2c68075da94982880f327b17ce01bc7..9a53352599d2d74601b9c68516cba785fd109a9d 100644 (file)
--- a/bin/named/os.c
+++ b/bin/named/os.c
@@ -300,10 +300,10 @@ named_os_daemonize(void) {
                        char buf;
                        n = read(dfd[0], &buf, 1);
                        if (n == 1) {
-                               _exit(0);
+                               _exit(EXIT_SUCCESS);
                        }
                } while (n == -1 && errno == EINTR);
-               _exit(1);
+               _exit(EXIT_FAILURE);
        }
        (void)close(dfd[0]);
 

diff --git a/bin/named/server.c b/bin/named/server.c
index c88a47574ac35409ef7252102ffa964e4c25c1e1..9ad6d6046bbf17b111eea3a9c22045542ce573fd 100644 (file)
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -148,11 +148,11 @@
 #endif /* HAVE_LMDB */
 
 #ifndef SIZE_MAX
-#define SIZE_MAX ((size_t)-1)
+#define SIZE_MAX ((size_t) - 1)
 #endif /* ifndef SIZE_MAX */
 
 #ifndef SIZE_AS_PERCENT
-#define SIZE_AS_PERCENT ((size_t)-2)
+#define SIZE_AS_PERCENT ((size_t) - 2)
 #endif /* ifndef SIZE_AS_PERCENT */
 
 #ifdef TUNE_LARGE
@@ -10427,7 +10427,7 @@ fatal(named_server_t *server, const char *msg, isc_result_t result) {
                      NAMED_LOGMODULE_SERVER, ISC_LOG_CRITICAL,
                      "exiting (due to fatal error)");
        named_os_shutdown();
-       _exit(1);
+       _exit(EXIT_FAILURE);
 }
 
 static void

diff --git a/bin/nsupdate/nsupdate.c b/bin/nsupdate/nsupdate.c
index 8e068bebefa4d2eb315d065f344024dc0c1b630c..45ba90fba7bf5267b172d313375dadbb8bee80de 100644 (file)
--- a/bin/nsupdate/nsupdate.c
+++ b/bin/nsupdate/nsupdate.c
@@ -499,7 +499,7 @@ setup_keystr(void) {
                name = secretstr;
                secretstr = n + 1;
                if (!parse_hmac(&hmacname, keystr, s - keystr, &digestbits)) {
-                       exit(1);
+                       exit(EXIT_FAILURE);
                }
        } else {
                hmacname = DNS_TSIG_HMACMD5_NAME;
@@ -1027,7 +1027,7 @@ pre_parse_args(int argc, char **argv) {
                                        "| -k keyfile] [-p port] "
                                        "[-v] [-V] [-P] [-T] [-4 | -6] "
                                        "[filename]\n");
-                       exit(1);
+                       exit(EXIT_FAILURE);
 
                case 'P':
                        for (t = 0xff00; t <= 0xfffe; t++) {
@@ -1065,7 +1065,7 @@ pre_parse_args(int argc, char **argv) {
                }
        }
        if (doexit) {
-               exit(0);
+               exit(EXIT_SUCCESS);
        }
        isc_commandline_reset = true;
        isc_commandline_index = 1;
@@ -1124,7 +1124,7 @@ parse_args(int argc, char **argv) {
                                        "bad library debug value "
                                        "'%s'\n",
                                        isc_commandline_argument);
-                               exit(1);
+                               exit(EXIT_FAILURE);
                        }
                        logdebuglevel = i;
                        break;
@@ -1153,7 +1153,7 @@ parse_args(int argc, char **argv) {
                                        "bad port number "
                                        "'%s'\n",
                                        isc_commandline_argument);
-                               exit(1);
+                               exit(EXIT_FAILURE);
                        }
                        break;
                case 't':
@@ -1162,7 +1162,7 @@ parse_args(int argc, char **argv) {
                        if (result != ISC_R_SUCCESS) {
                                fprintf(stderr, "bad timeout '%s'\n",
                                        isc_commandline_argument);
-                               exit(1);
+                               exit(EXIT_FAILURE);
                        }
                        if (timeout == 0) {
                                timeout = UINT_MAX;
@@ -1174,7 +1174,7 @@ parse_args(int argc, char **argv) {
                        if (result != ISC_R_SUCCESS) {
                                fprintf(stderr, "bad udp timeout '%s'\n",
                                        isc_commandline_argument);
-                               exit(1);
+                               exit(EXIT_FAILURE);
                        }
                        break;
                case 'r':
@@ -1183,7 +1183,7 @@ parse_args(int argc, char **argv) {
                        if (result != ISC_R_SUCCESS) {
                                fprintf(stderr, "bad udp retries '%s'\n",
                                        isc_commandline_argument);
-                               exit(1);
+                               exit(EXIT_FAILURE);
                        }
                        break;
 
@@ -1194,19 +1194,19 @@ parse_args(int argc, char **argv) {
                default:
                        fprintf(stderr, "%s: unhandled option: %c\n", argv[0],
                                isc_commandline_option);
-                       exit(1);
+                       exit(EXIT_FAILURE);
                }
        }
        if (keyfile != NULL && keystr != NULL) {
                fprintf(stderr, "%s: cannot specify both -k and -y\n", argv[0]);
-               exit(1);
+               exit(EXIT_FAILURE);
        }
 
 #if HAVE_GSSAPI
        if (usegsstsig && (keyfile != NULL || keystr != NULL)) {
                fprintf(stderr, "%s: cannot specify -g with -k or -y\n",
                        argv[0]);
-               exit(1);
+               exit(EXIT_FAILURE);
        }
 #else  /* HAVE_GSSAPI */
        if (usegsstsig) {
@@ -1214,7 +1214,7 @@ parse_args(int argc, char **argv) {
                        "%s: cannot specify -g  or -o, "
                        "program not linked with GSS API Library\n",
                        argv[0]);
-               exit(1);
+               exit(EXIT_FAILURE);
        }
 #endif /* HAVE_GSSAPI */
 
@@ -1228,7 +1228,7 @@ parse_args(int argc, char **argv) {
                                fprintf(stderr, "could not open '%s': %s\n",
                                        argv[isc_commandline_index],
                                        isc_result_totext(result));
-                               exit(1);
+                               exit(EXIT_FAILURE);
                        }
                }
                if (!force_interactive) {
@@ -2072,7 +2072,7 @@ show_message(FILE *stream, dns_message_t *msg, const char *description) {
                if (bufsz > MAXTEXT) {
                        fprintf(stderr, "could not allocate large enough "
                                        "buffer to display message\n");
-                       exit(1);
+                       exit(EXIT_FAILURE);
                }
                if (buf != NULL) {
                        isc_buffer_free(&buf);
@@ -3457,7 +3457,7 @@ main(int argc, char **argv) {
 
        if (seenerror) {
                return (2);
-       } else {
-               return (0);
        }
+
+       return (0);
 }

diff --git a/bin/rndc/rndc.c b/bin/rndc/rndc.c
index 87c36ba07ab4a905392d3631dc427a4a108c49b2..882026bb9519a39214e5660ca8b88ac4f55e174d 100644 (file)
--- a/bin/rndc/rndc.c
+++ b/bin/rndc/rndc.c
@@ -1014,7 +1014,7 @@ main(int argc, char **argv) {
                default:
                        fprintf(stderr, "%s: unhandled option -%c\n", program,
                                isc_commandline_option);
-                       exit(1);
+                       exit(EXIT_FAILURE);
                }
        }
 

diff --git a/bin/tests/system/pipelined/pipequeries.c b/bin/tests/system/pipelined/pipequeries.c
index 7419d22b0e6f6cfb25933e14b7fc9764bf1fe4e8..52e2a54424ec28987890bb2a4687e42dc55670b4 100644 (file)
--- a/bin/tests/system/pipelined/pipequeries.c
+++ b/bin/tests/system/pipelined/pipequeries.c
@@ -50,7 +50,7 @@
                if ((x) != ISC_R_SUCCESS) {                  \
                        fprintf(stderr, "I:%s: %s\n", (str), \
                                isc_result_totext(x));       \
-                       exit(-1);                            \
+                       exit(EXIT_FAILURE);                  \
                }                                            \
        }
 
@@ -82,7 +82,7 @@ recvresponse(isc_task_t *task, isc_event_t *event) {
        if (reqev->result != ISC_R_SUCCESS) {
                fprintf(stderr, "I:request event result: %s\n",
                        isc_result_totext(reqev->result));
-               exit(-1);
+               exit(EXIT_FAILURE);
        }
 
        query = reqev->ev_arg;
@@ -97,7 +97,7 @@ recvresponse(isc_task_t *task, isc_event_t *event) {
                result = dns_result_fromrcode(response->rcode);
                fprintf(stderr, "I:response rcode: %s\n",
                        isc_result_totext(result));
-               exit(-1);
+               exit(EXIT_FAILURE);
        }
        if (response->counts[DNS_SECTION_ANSWER] != 1U) {
                fprintf(stderr, "I:response answer count (%u!=1)\n",
@@ -221,7 +221,7 @@ main(int argc, char *argv[]) {
                        if (result != ISC_R_SUCCESS) {
                                fprintf(stderr, "bad port '%s'\n",
                                        isc_commandline_argument);
-                               exit(1);
+                               exit(EXIT_FAILURE);
                        }
                        break;
                case 'r':

diff --git a/bin/tests/system/resolve.c b/bin/tests/system/resolve.c
index 3142757d589d4e678eac31164a4845acd759838d..14df6c0b831bd2e1faea8dd9e566a0070d000f6b 100644 (file)
--- a/bin/tests/system/resolve.c
+++ b/bin/tests/system/resolve.c
@@ -137,7 +137,7 @@ usage(void) {
                        "[-S domain:serveraddr_for_domain ] [-s server_address]"
                        "[-b address[#port]] hostname\n");
 
-       exit(1);
+       exit(EXIT_FAILURE);
 }
 
 static void
@@ -162,7 +162,7 @@ set_key(dns_client_t *client, char *keynamestr, char *keystr, bool is_sep) {
                result = dns_secalg_fromtext(&alg, &tr);
                if (result != ISC_R_SUCCESS) {
                        fprintf(stderr, "failed to identify the algorithm\n");
-                       exit(1);
+                       exit(EXIT_FAILURE);
                }
        } else {
                alg = DNS_KEYALG_RSASHA1;
@@ -182,7 +182,7 @@ set_key(dns_client_t *client, char *keynamestr, char *keystr, bool is_sep) {
        result = isc_base64_decodestring(keystr, &keydatabuf);
        if (result != ISC_R_SUCCESS) {
                fprintf(stderr, "base64 decode failed\n");
-               exit(1);
+               exit(EXIT_FAILURE);
        }
        isc_buffer_usedregion(&keydatabuf, &r);
        keystruct.datalen = r.length;
@@ -193,7 +193,7 @@ set_key(dns_client_t *client, char *keynamestr, char *keystr, bool is_sep) {
                                      &rrdatabuf);
        if (result != ISC_R_SUCCESS) {
                fprintf(stderr, "failed to construct key rdata\n");
-               exit(1);
+               exit(EXIT_FAILURE);
        }
        namelen = strlen(keynamestr);
        isc_buffer_init(&b, keynamestr, namelen);
@@ -202,14 +202,14 @@ set_key(dns_client_t *client, char *keynamestr, char *keystr, bool is_sep) {
        result = dns_name_fromtext(keyname, &b, dns_rootname, 0, NULL);
        if (result != ISC_R_SUCCESS) {
                fprintf(stderr, "failed to construct key name\n");
-               exit(1);
+               exit(EXIT_FAILURE);
        }
        result = dns_client_addtrustedkey(client, dns_rdataclass_in,
                                          dns_rdatatype_dnskey, keyname,
                                          &rrdatabuf);
        if (result != ISC_R_SUCCESS) {
                fprintf(stderr, "failed to add key for %s\n", keynamestr);
-               exit(1);
+               exit(EXIT_FAILURE);
        }
 }
 
@@ -234,7 +234,7 @@ addserver(dns_client_t *client, const char *addrstr, const char *port,
        if (gaierror != 0) {
                fprintf(stderr, "getaddrinfo failed: %s\n",
                        gai_strerror(gaierror));
-               exit(1);
+               exit(EXIT_FAILURE);
        }
        INSIST(res->ai_addrlen <= sizeof(sa.type));
        memmove(&sa.type, res->ai_addr, res->ai_addrlen);
@@ -253,7 +253,7 @@ addserver(dns_client_t *client, const char *addrstr, const char *port,
                if (result != ISC_R_SUCCESS) {
                        fprintf(stderr, "failed to convert qname: %u\n",
                                result);
-                       exit(1);
+                       exit(EXIT_FAILURE);
                }
        }
 
@@ -261,7 +261,7 @@ addserver(dns_client_t *client, const char *addrstr, const char *port,
                                       &servers);
        if (result != ISC_R_SUCCESS) {
                fprintf(stderr, "set server failed: %u\n", result);
-               exit(1);
+               exit(EXIT_FAILURE);
        }
 }
 
@@ -303,7 +303,7 @@ main(int argc, char *argv[]) {
                        if (result != ISC_R_SUCCESS) {
                                fprintf(stderr, "invalid RRtype: %s\n",
                                        isc_commandline_argument);
-                               exit(1);
+                               exit(EXIT_FAILURE);
                        }
                        break;
                case 'a':
@@ -317,7 +317,7 @@ main(int argc, char *argv[]) {
                                        fprintf(stderr, "only one local "
                                                        "address per family "
                                                        "can be specified\n");
-                                       exit(1);
+                                       exit(EXIT_FAILURE);
                                }
                                isc_sockaddr_fromin(&a4, &in4, 0);
                                addr4 = &a4;
@@ -328,14 +328,14 @@ main(int argc, char *argv[]) {
                                        fprintf(stderr, "only one local "
                                                        "address per family "
                                                        "can be specified\n");
-                                       exit(1);
+                                       exit(EXIT_FAILURE);
                                }
                                isc_sockaddr_fromin6(&a6, &in6, 0);
                                addr6 = &a6;
                        } else {
                                fprintf(stderr, "invalid address %s\n",
                                        isc_commandline_argument);
-                               exit(1);
+                               exit(EXIT_FAILURE);
                        }
                        break;
                case 'e':
@@ -347,7 +347,7 @@ main(int argc, char *argv[]) {
                                        "alternate server "
                                        "already defined: %s\n",
                                        altserver);
-                               exit(1);
+                               exit(EXIT_FAILURE);
                        }
                        altserver = isc_commandline_argument;
                        break;
@@ -357,7 +357,7 @@ main(int argc, char *argv[]) {
                                        "server "
                                        "already defined: %s\n",
                                        server);
-                               exit(1);
+                               exit(EXIT_FAILURE);
                        }
                        server = isc_commandline_argument;
                        break;
@@ -388,7 +388,7 @@ main(int argc, char *argv[]) {
                if (cp == NULL) {
                        fprintf(stderr, "invalid alternate server: %s\n",
                                altserver);
-                       exit(1);
+                       exit(EXIT_FAILURE);
                }
                *cp = '\0';
                altservername = altserver;
@@ -403,7 +403,7 @@ main(int argc, char *argv[]) {
        result = dst_lib_init(ctxs_mctx, NULL);
        if (result != ISC_R_SUCCESS) {
                fprintf(stderr, "dst_lib_init failed: %u\n", result);
-               exit(1);
+               exit(EXIT_FAILURE);
        }
 
        clientopt = 0;
@@ -413,7 +413,7 @@ main(int argc, char *argv[]) {
        if (result != ISC_R_SUCCESS) {
                fprintf(stderr, "dns_client_create failed: %u, %s\n", result,
                        isc_result_totext(result));
-               exit(1);
+               exit(EXIT_FAILURE);
        }
 
        /* Set the nameserver */
@@ -426,7 +426,7 @@ main(int argc, char *argv[]) {
                if (result != ISC_R_SUCCESS && result != ISC_R_FILENOTFOUND) {
                        fprintf(stderr, "irs_resconf_load failed: %u\n",
                                result);
-                       exit(1);
+                       exit(EXIT_FAILURE);
                }
                nameservers = irs_resconf_getnameservers(resconf);
                result = dns_client_setservers(client, dns_rdataclass_in, NULL,
@@ -435,7 +435,7 @@ main(int argc, char *argv[]) {
                        irs_resconf_destroy(&resconf);
                        fprintf(stderr, "dns_client_setservers failed: %u\n",
                                result);
-                       exit(1);
+                       exit(EXIT_FAILURE);
                }
                irs_resconf_destroy(&resconf);
        } else {
@@ -452,7 +452,7 @@ main(int argc, char *argv[]) {
                if (keystr == NULL) {
                        fprintf(stderr, "key string is missing "
                                        "while key name is provided\n");
-                       exit(1);
+                       exit(EXIT_FAILURE);
                }
                set_key(client, keynamestr, keystr, is_sep);
        }

diff --git a/bin/tests/system/rsabigexponent/bigkey.c b/bin/tests/system/rsabigexponent/bigkey.c
index 19fc9bad08fa0c1a2089a18ea8ed84631232a22f..59525da53e81b723ae9084cd24f795ee92778c4f 100644 (file)
--- a/bin/tests/system/rsabigexponent/bigkey.c
+++ b/bin/tests/system/rsabigexponent/bigkey.c
@@ -68,7 +68,7 @@ EVP_PKEY *pkey;
                                msg, isc_result_totext(result), __FILE__,     \
                                __LINE__);                                    \
                        ERR_clear_error();                                    \
-                       exit(1);                                              \
+                       exit(EXIT_FAILURE);                                   \
                }                                                             \
        } while (0)
 
@@ -86,7 +86,7 @@ main(int argc, char **argv) {
        {
                fprintf(stderr, "fatal error: basic OpenSSL failure\n");
                ERR_clear_error();
-               exit(1);
+               exit(EXIT_FAILURE);
        }
 
        /* e = 0x1000000000001 */
@@ -102,7 +102,7 @@ main(int argc, char **argv) {
                        "at file %s line %d\n",
                        __FILE__, __LINE__);
                ERR_clear_error();
-               exit(1);
+               exit(EXIT_FAILURE);
        }
 
        isc_mem_create(&mctx);

diff --git a/bin/tests/system/tkey/keycreate.c b/bin/tests/system/tkey/keycreate.c
index 37f6e48cb6adacf06af5fcc5ba6ef3b13011ead2..50f3eb275ea913e5684d54f499f639a213ee2c35 100644 (file)
--- a/bin/tests/system/tkey/keycreate.c
+++ b/bin/tests/system/tkey/keycreate.c
@@ -45,7 +45,7 @@
                if ((x) != ISC_R_SUCCESS) {                  \
                        fprintf(stderr, "I:%s: %s\n", (str), \
                                isc_result_totext(x));       \
-                       exit(-1);                            \
+                       exit(EXIT_FAILURE);                  \
                }                                            \
        }
 
@@ -81,7 +81,7 @@ recvquery(isc_task_t *task, isc_event_t *event) {
        if (reqev->result != ISC_R_SUCCESS) {
                fprintf(stderr, "I:request event result: %s\n",
                        isc_result_totext(reqev->result));
-               exit(-1);
+               exit(EXIT_FAILURE);
        }
 
        query = reqev->ev_arg;
@@ -96,7 +96,7 @@ recvquery(isc_task_t *task, isc_event_t *event) {
                result = dns_result_fromrcode(response->rcode);
                fprintf(stderr, "I:response rcode: %s\n",
                        isc_result_totext(result));
-               exit(-1);
+               exit(EXIT_FAILURE);
        }
 
        result = dns_tkey_processdhresponse(query, response, ourkey, &nonce,
@@ -204,7 +204,7 @@ main(int argc, char *argv[]) {
 
        if (argc < 4) {
                fprintf(stderr, "I:no DH key provided\n");
-               exit(-1);
+               exit(EXIT_FAILURE);
        }
        ip_address = argv[1];
        port = atoi(argv[2]);

diff --git a/bin/tests/system/tkey/keydelete.c b/bin/tests/system/tkey/keydelete.c
index f653a183dfe4803e6c8fe04dc4cd64f32e6b9e5a..563f5914c1d341b1cfa5909abc654a5fa8bbc538 100644 (file)
--- a/bin/tests/system/tkey/keydelete.c
+++ b/bin/tests/system/tkey/keydelete.c
@@ -44,7 +44,7 @@
                if ((x) != ISC_R_SUCCESS) {                  \
                        fprintf(stderr, "I:%s: %s\n", (str), \
                                isc_result_totext(x));       \
-                       exit(-1);                            \
+                       exit(EXIT_FAILURE);                  \
                }                                            \
        }
 
@@ -72,7 +72,7 @@ recvquery(isc_task_t *task, isc_event_t *event) {
        if (reqev->result != ISC_R_SUCCESS) {
                fprintf(stderr, "I:request event result: %s\n",
                        isc_result_totext(reqev->result));
-               exit(-1);
+               exit(EXIT_FAILURE);
        }
 
        query = reqev->ev_arg;
@@ -87,7 +87,7 @@ recvquery(isc_task_t *task, isc_event_t *event) {
                result = dns_result_fromrcode(response->rcode);
                fprintf(stderr, "I:response rcode: %s\n",
                        isc_result_totext(result));
-               exit(-1);
+               exit(EXIT_FAILURE);
        }
 
        result = dns_tkey_processdeleteresponse(query, response, ring);
@@ -149,11 +149,11 @@ main(int argc, char **argv) {
 
        if (argc < 4) {
                fprintf(stderr, "I:no key to delete\n");
-               exit(-1);
+               exit(EXIT_FAILURE);
        }
        if (strcmp(argv[1], "-r") == 0) {
                fprintf(stderr, "I:The -r options has been deprecated\n");
-               exit(-1);
+               exit(EXIT_FAILURE);
        }
        ip_address = argv[1];
        port = atoi(argv[2]);

diff --git a/bin/tests/test_client.c b/bin/tests/test_client.c
index ad6a4c7f41a3d4bcda4121f7fe3c24ac44cefd7f..39d2aa589b6d04dafd3b01d5b2bbe9665f798386 100644 (file)
--- a/bin/tests/test_client.c
+++ b/bin/tests/test_client.c
@@ -449,5 +449,5 @@ main(int argc, char **argv) {
 
        teardown();
 
-       exit(EXIT_SUCCESS);
+       return (EXIT_SUCCESS);
 }

diff --git a/bin/tests/test_server.c b/bin/tests/test_server.c
index 3dedf6a61027f5687da2bd9298cf9e58ea1ee4ff..2c03a20a88e719b780d46d5cfbc485bdda214cd7 100644 (file)
--- a/bin/tests/test_server.c
+++ b/bin/tests/test_server.c
@@ -322,5 +322,5 @@ main(int argc, char **argv) {
 
        teardown();
 
-       exit(EXIT_SUCCESS);
+       return (EXIT_SUCCESS);
 }

diff --git a/bin/tests/wire_test.c b/bin/tests/wire_test.c
index b21f5f0f52be42968aefdaafb451dc98e65c1225..e7d28898bce9b47965cb84f24edc975b14e7f226 100644 (file)
--- a/bin/tests/wire_test.c
+++ b/bin/tests/wire_test.c
@@ -42,7 +42,7 @@ CHECKRESULT(isc_result_t result, const char *msg) {
        if (result != ISC_R_SUCCESS) {
                printf("%s: %s\n", msg, isc_result_totext(result));
 
-               exit(1);
+               exit(EXIT_FAILURE);
        }
 }
 
@@ -57,7 +57,7 @@ fromhex(char c) {
        }
 
        fprintf(stderr, "bad input format: %02x\n", c);
-       exit(3);
+       exit(EXIT_FAILURE);
 }
 
 static void
@@ -164,7 +164,7 @@ main(int argc, char *argv[]) {
                        break;
                default:
                        usage();
-                       exit(1);
+                       exit(EXIT_FAILURE);
                }
        }
 
@@ -175,7 +175,7 @@ main(int argc, char *argv[]) {
                f = fopen(argv[0], "r");
                if (f == NULL) {
                        fprintf(stderr, "%s: fopen failed\n", argv[0]);
-                       exit(1);
+                       exit(EXIT_FAILURE);
                }
                need_close = true;
        } else {
@@ -215,7 +215,7 @@ main(int argc, char *argv[]) {
                        if (len % 2 != 0U) {
                                fprintf(stderr, "bad input format: %lu\n",
                                        (unsigned long)len);
-                               exit(1);
+                               exit(EXIT_FAILURE);
                        }
 
                        rp = s;
@@ -240,13 +240,13 @@ main(int argc, char *argv[]) {
 
                        if (isc_buffer_remaininglength(input) < 2) {
                                fprintf(stderr, "premature end of packet\n");
-                               exit(1);
+                               exit(EXIT_FAILURE);
                        }
                        tcplen = isc_buffer_getuint16(input);
 
                        if (isc_buffer_remaininglength(input) < tcplen) {
                                fprintf(stderr, "premature end of packet\n");
-                               exit(1);
+                               exit(EXIT_FAILURE);
                        }
                        process_message(input);
                }

diff --git a/bin/tools/dnstap-read.c b/bin/tools/dnstap-read.c
index c55534feb46ce1ad469b6a0d5bc0c658bfaab144..a1d0243a1a8c30b82e6ba8bc364b46fe7b96086b 100644 (file)
--- a/bin/tools/dnstap-read.c
+++ b/bin/tools/dnstap-read.c
@@ -349,7 +349,7 @@ main(int argc, char *argv[]) {
                        break;
                default:
                        usage();
-                       exit(1);
+                       exit(EXIT_FAILURE);
                }
        }
 

diff --git a/bin/tools/mdig.c b/bin/tools/mdig.c
index 12f289ffb2f847d65e2fc127d8f3f32770b6cca8..b0ff68718a3a93c0a6951dba879191918d320d49 100644 (file)
--- a/bin/tools/mdig.c
+++ b/bin/tools/mdig.c
@@ -61,7 +61,7 @@
                if ((x) != ISC_R_SUCCESS) {                                 \
                        fprintf(stderr, "mdig: %s failed with %s\n", (str), \
                                isc_result_totext(x));                      \
-                       exit(-1);                                           \
+                       exit(EXIT_FAILURE);                                 \
                }                                                           \
        }
 
@@ -208,7 +208,7 @@ recvresponse(isc_task_t *task, isc_event_t *event) {
                if (continue_on_error) {
                        goto cleanup;
                } else {
-                       exit(-1);
+                       exit(EXIT_FAILURE);
                }
        }
 
@@ -789,7 +789,7 @@ usage(void) {
                        "           {local-opt} [ host {local-opt} [...]]\n"
                        "\nUse \"mdig -h\" (or \"mdig -h | more\") "
                        "for complete list of options\n");
-       exit(1);
+       exit(EXIT_FAILURE);
 }
 
 /*% help */
@@ -1703,7 +1703,7 @@ dash_option(const char *option, char *next, struct query *query, bool global,
                        break;
                case 'h':
                        help();
-                       exit(0);
+                       exit(EXIT_SUCCESS);
                        break;
                case 'i':
                        /* deprecated */
@@ -1715,7 +1715,7 @@ dash_option(const char *option, char *next, struct query *query, bool global,
                        break;
                case 'v':
                        fprintf(stderr, "mDiG %s\n", PACKAGE_VERSION);
-                       exit(0);
+                       exit(EXIT_SUCCESS);
                        break;
                }
                if (strlen(option) > 1U) {

diff --git a/bin/tools/named-journalprint.c b/bin/tools/named-journalprint.c
index 402163df4f0420e91e3b27df1fa49c6286b888b4..8f38969c3b3f7f3fa172106fbc91daff0372d5f7 100644 (file)
--- a/bin/tools/named-journalprint.c
+++ b/bin/tools/named-journalprint.c
@@ -31,7 +31,7 @@ const char *progname = NULL;
 static void
 usage(void) {
        fprintf(stderr, "Usage: %s [-dux] journal\n", progname);
-       exit(1);
+       exit(EXIT_FAILURE);
 }
 
 /*
@@ -85,7 +85,7 @@ main(int argc, char **argv) {
                        if (endp == isc_commandline_argument || *endp != 0) {
                                fprintf(stderr, "invalid serial: %s\n",
                                        isc_commandline_argument);
-                               exit(1);
+                               exit(EXIT_FAILURE);
                        }
                        break;
                case 'd':

diff --git a/bin/tools/named-nzd2nzf.c b/bin/tools/named-nzd2nzf.c
index 630b65bcf6534f27cbaaf22135d1dd55f83c9fb4..49e4232e331fa117e03dd6a5317f9bd8e48a7305 100644 (file)
--- a/bin/tools/named-nzd2nzf.c
+++ b/bin/tools/named-nzd2nzf.c
@@ -35,7 +35,7 @@ main(int argc, char *argv[]) {
 
        if (argc != 2) {
                fprintf(stderr, "Usage: named-nzd2nzf <nzd-path>\n");
-               exit(1);
+               exit(EXIT_FAILURE);
        }
 
        path = argv[1];
@@ -44,35 +44,35 @@ main(int argc, char *argv[]) {
        if (status != MDB_SUCCESS) {
                fprintf(stderr, "named-nzd2nzf: mdb_env_create: %s",
                        mdb_strerror(status));
-               exit(1);
+               exit(EXIT_FAILURE);
        }
 
        status = mdb_env_open(env, path, DNS_LMDB_FLAGS, 0600);
        if (status != MDB_SUCCESS) {
                fprintf(stderr, "named-nzd2nzf: mdb_env_open: %s",
                        mdb_strerror(status));
-               exit(1);
+               exit(EXIT_FAILURE);
        }
 
        status = mdb_txn_begin(env, 0, MDB_RDONLY, &txn);
        if (status != MDB_SUCCESS) {
                fprintf(stderr, "named-nzd2nzf: mdb_txn_begin: %s",
                        mdb_strerror(status));
-               exit(1);
+               exit(EXIT_FAILURE);
        }
 
        status = mdb_dbi_open(txn, NULL, 0, &dbi);
        if (status != MDB_SUCCESS) {
                fprintf(stderr, "named-nzd2nzf: mdb_dbi_open: %s",
                        mdb_strerror(status));
-               exit(1);
+               exit(EXIT_FAILURE);
        }
 
        status = mdb_cursor_open(txn, dbi, &cursor);
        if (status != MDB_SUCCESS) {
                fprintf(stderr, "named-nzd2nzf: mdb_cursor_open: %s",
                        mdb_strerror(status));
-               exit(1);
+               exit(EXIT_FAILURE);
        }
 
        for (status = mdb_cursor_get(cursor, &key, &data, MDB_FIRST);
@@ -86,7 +86,7 @@ main(int argc, char *argv[]) {
                                "named-nzd2nzf: empty column found in "
                                "database '%s'",
                                path);
-                       exit(1);
+                       exit(EXIT_FAILURE);
                }
 
                /* zone zonename { config; }; */
@@ -98,5 +98,6 @@ main(int argc, char *argv[]) {
        mdb_cursor_close(cursor);
        mdb_txn_abort(txn);
        mdb_env_close(env);
-       exit(0);
+
+       return (0);
 }

diff --git a/bin/tools/named-rrchecker.c b/bin/tools/named-rrchecker.c
index 278a0a267da0b9831b9b5cfbb9496b517b9d2a44..e695805763e00359361eea94444d11bfbf60bf63 100644 (file)
--- a/bin/tools/named-rrchecker.c
+++ b/bin/tools/named-rrchecker.c
@@ -50,7 +50,7 @@ usage(void) {
        fprintf(stderr, "\t-P: list the supported private type names\n");
        fprintf(stderr, "\t-T: list the supported standard type names\n");
        fprintf(stderr, "\t-u: print the record in unknown record format\n");
-       exit(0);
+       exit(EXIT_SUCCESS);
 }
 
 static void
@@ -126,7 +126,7 @@ main(int argc, char *argv[]) {
                                        fprintf(stdout, "%s\n", text);
                                }
                        }
-                       exit(0);
+                       exit(EXIT_SUCCESS);
 
                case 'P':
                        for (t = 0xff00; t <= 0xfffeu; t++) {
@@ -162,11 +162,11 @@ main(int argc, char *argv[]) {
                default:
                        fprintf(stderr, "%s: unhandled option -%c\n", argv[0],
                                isc_commandline_option);
-                       exit(1);
+                       exit(EXIT_FAILURE);
                }
        }
        if (doexit) {
-               exit(0);
+               exit(EXIT_SUCCESS);
        }
 
        isc_mem_create(&mctx);

diff --git a/bin/tools/nsec3hash.c b/bin/tools/nsec3hash.c
index e76f7be025bc7c2dba2ec26b1c31a878084a9169..2f0119d2e9f853b09cb715ae56dbc6d4c7265955 100644 (file)
--- a/bin/tools/nsec3hash.c
+++ b/bin/tools/nsec3hash.c
@@ -64,7 +64,7 @@ usage(void) {
                program);
        fprintf(stderr, "       %s -r algorithm flags iterations salt domain\n",
                program);
-       exit(1);
+       exit(EXIT_FAILURE);
 }
 
 typedef void

diff --git a/doc/misc/cfg_test.c b/doc/misc/cfg_test.c
index d5f36549e27214aea4ed9fa91fb83f4cb7b53b1b..ff86177414a50a05a62da79458be54544aa783b7 100644 (file)
--- a/doc/misc/cfg_test.c
+++ b/doc/misc/cfg_test.c
@@ -39,7 +39,7 @@ check_result(isc_result_t result, const char *format, ...) {
        vfprintf(stderr, format, args);
        va_end(args);
        fprintf(stderr, ": %s\n", isc_result_totext(result));
-       exit(1);
+       exit(EXIT_FAILURE);
 }
 
 static void
@@ -53,7 +53,7 @@ usage(void) {
        fprintf(stderr, "usage: cfg_test --rndc|--named "
                        "[--grammar] [--zonegrammar] [--active] "
                        "[--memstats] conffile\n");
-       exit(1);
+       exit(EXIT_FAILURE);
 }
 
 int
@@ -169,7 +169,7 @@ main(int argc, char **argv) {
                fprintf(stderr, "read config: %s\n", isc_result_totext(result));
 
                if (result != ISC_R_SUCCESS) {
-                       exit(1);
+                       exit(EXIT_FAILURE);
                }
 
                cfg_print(cfg, output, NULL);
@@ -189,7 +189,7 @@ main(int argc, char **argv) {
        if (ferror(stdout)) {
                fprintf(stderr, "write error\n");
                return (1);
-       } else {
-               return (0);
        }
+
+       return (0);
 }

diff --git a/lib/dns/gen.c b/lib/dns/gen.c
index 7cbdf0a6c2e3485ebf1f00b231385d4eb5da2084..d73557e1cbe12ede793f96987aa858283c2f7f26 100644 (file)
--- a/lib/dns/gen.c
+++ b/lib/dns/gen.c
@@ -204,7 +204,7 @@ next_file(isc_dir_t *dir) {
                                fprintf(stderr,
                                        "Error: reading directory: %s\n",
                                        strerror(errno));
-                               exit(1);
+                               exit(EXIT_FAILURE);
                        }
                }
        }
@@ -363,7 +363,7 @@ insert_into_typenames(int type, const char *typebuf, const char *attr) {
                        fprintf(stderr,
                                "Error:  type %d has two names: %s, %s\n", type,
                                typenames[i].typebuf, typebuf);
-                       exit(1);
+                       exit(EXIT_FAILURE);
                }
                if (typenames[i].typebuf[0] == 0 && ttn == NULL) {
                        ttn = &typenames[i];
@@ -371,13 +371,13 @@ insert_into_typenames(int type, const char *typebuf, const char *attr) {
        }
        if (ttn == NULL) {
                fprintf(stderr, "Error: typenames array too small\n");
-               exit(1);
+               exit(EXIT_FAILURE);
        }
 
        /* XXXMUKS: This is redundant due to the INSIST above. */
        if (strlen(typebuf) > sizeof(ttn->typebuf) - 1) {
                fprintf(stderr, "Error:  type name %s is too long\n", typebuf);
-               exit(1);
+               exit(EXIT_FAILURE);
        }
 
        strncpy(ttn->typebuf, typebuf, sizeof(ttn->typebuf));
@@ -407,13 +407,13 @@ insert_into_typenames(int type, const char *typebuf, const char *attr) {
                        "Error:  type %d has different attributes: "
                        "%s, %s\n",
                        type, ttn->attr, attr);
-               exit(1);
+               exit(EXIT_FAILURE);
        }
 
        if (strlen(attr) > sizeof(ttn->attr) - 1) {
                fprintf(stderr, "Error:  attr (%s) [name %s] is too long\n",
                        attr, typebuf);
-               exit(1);
+               exit(EXIT_FAILURE);
        }
 
        strncpy(ttn->attr, attr, sizeof(ttn->attr));
@@ -441,7 +441,7 @@ add(unsigned int rdclass, const char *classbuf, int type, const char *typebuf,
 
        if (newtt == NULL) {
                fprintf(stderr, "malloc() failed\n");
-               exit(1);
+               exit(EXIT_FAILURE);
        }
 
        newtt->next = NULL;
@@ -470,14 +470,14 @@ add(unsigned int rdclass, const char *classbuf, int type, const char *typebuf,
 
        while ((tt != NULL) && (tt->type == type) && (tt->rdclass < rdclass)) {
                if (strcmp(tt->typebuf, typebuf) != 0) {
-                       exit(1);
+                       exit(EXIT_FAILURE);
                }
                oldtt = tt;
                tt = tt->next;
        }
 
        if ((tt != NULL) && (tt->type == type) && (tt->rdclass == rdclass)) {
-               exit(1);
+               exit(EXIT_FAILURE);
        }
 
        newtt->next = tt;
@@ -497,7 +497,7 @@ add(unsigned int rdclass, const char *classbuf, int type, const char *typebuf,
        newcc = (struct cc *)malloc(sizeof(*newcc));
        if (newcc == NULL) {
                fprintf(stderr, "malloc() failed\n");
-               exit(1);
+               exit(EXIT_FAILURE);
        }
        newcc->rdclass = rdclass;
        strncpy(newcc->classbuf, classbuf, sizeof(newcc->classbuf));
@@ -555,7 +555,7 @@ sd(unsigned int rdclass, const char *classbuf, const char *dirbuf,
                if (type > 65535) {
                        fprintf(stderr, "Error: type value > 65535 (%s)\n",
                                dir.filename);
-                       exit(1);
+                       exit(EXIT_FAILURE);
                }
                add(rdclass, classbuf, type, typebuf, dirbuf);
        }
@@ -571,7 +571,7 @@ HASH(char *string) {
        n = strlen(string);
        if (n == 0) {
                fprintf(stderr, "n == 0?\n");
-               exit(1);
+               exit(EXIT_FAILURE);
        }
        a = tolower((unsigned char)string[0]);
        b = tolower((unsigned char)string[n - 1]);
@@ -654,7 +654,7 @@ main(int argc, char **argv) {
                                    sizeof("/rdata/_65535_65535"))
                        {
                                fprintf(stderr, "\"%s\" too long\n", optarg);
-                               exit(1);
+                               exit(EXIT_FAILURE);
                        }
                        n = snprintf(srcdir, sizeof(srcdir), "%s/", optarg);
                        INSIST(n > 0 && (unsigned)n < sizeof(srcdir));
@@ -669,7 +669,7 @@ main(int argc, char **argv) {
                        suffix = optarg;
                        break;
                case '?':
-                       exit(1);
+                       exit(EXIT_FAILURE);
                }
        }
 
@@ -677,7 +677,7 @@ main(int argc, char **argv) {
        INSIST(n > 0 && (unsigned)n < sizeof(srcdir));
 
        if (!start_directory(buf, &dir)) {
-               exit(1);
+               exit(EXIT_FAILURE);
        }
 
        while (next_file(&dir)) {
@@ -700,7 +700,7 @@ main(int argc, char **argv) {
                if (rdclass > 65535) {
                        fprintf(stderr, "Error: class value > 65535 (%s)\n",
                                dir.filename);
-                       exit(1);
+                       exit(EXIT_FAILURE);
                }
                sd(rdclass, classbuf, buf, filetype);
        }
@@ -1055,7 +1055,7 @@ main(int argc, char **argv) {
        }
 
        if (ferror(stdout) != 0) {
-               exit(1);
+               exit(EXIT_FAILURE);
        }
 
        return (0);

diff --git a/lib/dns/openssl_link.c b/lib/dns/openssl_link.c
index addf16ad981c1a8f5779e4735199f5ef74ef5028..09625b8d179175900ca7bff293e35220d364d255 100644 (file)
--- a/lib/dns/openssl_link.c
+++ b/lib/dns/openssl_link.c
@@ -63,7 +63,7 @@ enable_fips_mode(void) {
 
        if (FIPS_mode_set(1) == 0) {
                dst__openssl_toresult2("FIPS_mode_set", DST_R_OPENSSLFAILURE);
-               exit(1);
+               exit(EXIT_FAILURE);
        }
 #endif /* HAVE_FIPS_MODE */
 }

diff --git a/lib/isc/app.c b/lib/isc/app.c
index da438d72a517a527faebcf00f99b39ecd7c5306b..6a60b36fdbf65cf2ab9eec48ca944ee6c0d7c1f2 100644 (file)
--- a/lib/isc/app.c
+++ b/lib/isc/app.c
@@ -260,7 +260,7 @@ isc_app_ctxrun(isc_appctx_t *ctx) {
                if (atomic_load_acquire(&ctx->want_shutdown) &&
                    atomic_load_acquire(&ctx->blocked))
                {
-                       exit(1);
+                       exit(EXIT_FAILURE);
                }
        }