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).

diff --git a/bin/check/named-checkconf.c b/bin/check/named-checkconf.c
index 19f672224e4808cc1926c9bd3c31be02162bfa66..50ab55f7bfb81cbe1136b020e7c89f1ad28df7a0 100644 (file)
--- a/bin/check/named-checkconf.c
+++ b/bin/check/named-checkconf.c
@@ -63,7 +63,7 @@ usage(void) {
                "usage: %s [-achijlvz] [-p [-x]] [-t directory] "
                "[named.conf]\n",
                program);
-       exit(1);
+       exit(EXIT_SUCCESS);
 }
 
 /*% directory callback */

diff --git a/bin/check/named-checkzone.c b/bin/check/named-checkzone.c
index 7ad917df9d1c22e780d960f2a79820f501711e32..db2e345561f14308951928bbfb057f47dc3bd05d 100644 (file)
--- a/bin/check/named-checkzone.c
+++ b/bin/check/named-checkzone.c
@@ -350,7 +350,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 4c2c3cafedde388ec98c8fdc9bdf8a375a626098..c840e2c2844e2123dba899fdeda3136c1ec1d283 100644 (file)
--- a/bin/confgen/rndc-confgen.c
+++ b/bin/confgen/rndc-confgen.c
@@ -146,7 +146,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;
@@ -192,15 +193,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);
                }
        }
 
@@ -209,7 +210,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 620717c6266f2ab71572ac8039eab2d5f365985b..c421702c8bf7b6df19f2bd020bf6287c31955e68 100644 (file)
--- a/bin/confgen/tsig-keygen.c
+++ b/bin/confgen/tsig-keygen.c
@@ -138,13 +138,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':
@@ -157,7 +157,7 @@ main(int argc, char **argv) {
                        if (progmode == progmode_confgen) {
                                quiet = true;
                        } else {
-                               usage(1);
+                               usage(EXIT_FAILURE);
                        }
                        break;
                case 'r':
@@ -167,29 +167,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);
                }
        }
 
@@ -200,11 +200,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 2d4de3d9739d0c6cf7c0ede4d7cf2c56b0019d9f..4bd00bfa9a34ce7edcffe2eefb7943c081eaaef2 100644 (file)
--- a/bin/delv/delv.c
+++ b/bin/delv/delv.c
@@ -247,7 +247,7 @@ usage(void) {
                "process)\n"
                "                 +[no]yaml           (Present the results as "
                "YAML)\n");
-       exit(1);
+       exit(EXIT_FAILURE);
 }
 
 noreturn static void
@@ -1163,7 +1163,7 @@ plus_option(char *option) {
                        if (state) {
                                fprintf(stderr, "Invalid option: "
                                                "+dlv is obsolete\n");
-                               exit(1);
+                               exit(EXIT_FAILURE);
                        }
                        break;
                case 'n': /* dnssec */
@@ -1430,7 +1430,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;
@@ -1440,7 +1440,7 @@ dash_option(char *option, char *next, bool *open_type_class) {
                        break;
                case 'v':
                        printf("delv %s\n", PACKAGE_VERSION);
-                       exit(0);
+                       exit(EXIT_SUCCESS);
                default:
                        UNREACHABLE();
                }
@@ -1577,7 +1577,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 e826486ed4726b684eb455ebf124270bb4834423..291490b741748e6590ca4b336ea3bf74f712311d 100644 (file)
--- a/bin/dig/dig.c
+++ b/bin/dig/dig.c
@@ -119,7 +119,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 */
 
@@ -2624,7 +2624,7 @@ dash_option(char *option, char *next, dig_lookup_t **lookup,
                        break;
                case 'h':
                        help();
-                       exit(0);
+                       exit(EXIT_SUCCESS);
                        break;
                case 'i':
                        fatal("-%c removed", option[0]);
@@ -2642,7 +2642,7 @@ dash_option(char *option, char *next, dig_lookup_t **lookup,
                        break;
                case 'v':
                        printf("DiG %s\n", PACKAGE_VERSION);
-                       exit(0);
+                       exit(EXIT_SUCCESS);
                        break;
                }
                if (strlen(option) > 1U) {
@@ -2851,7 +2851,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 7ed3e5d5a38d47e195c0fe4b9d64e42feeb73456..ccc3ad60b68bc24b8ebe0f2cd7f8ee35e15ee291 100644 (file)
--- a/bin/dig/host.c
+++ b/bin/dig/host.c
@@ -132,7 +132,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
@@ -654,7 +654,7 @@ pre_parse_args(int argc, char **argv) {
                        break;
                case 'V':
                        printf("host %s\n", PACKAGE_VERSION);
-                       exit(0);
+                       exit(EXIT_SUCCESS);
                        break;
                case 'w':
                        break;

diff --git a/bin/dig/nslookup.c b/bin/dig/nslookup.c
index dc43f7cdcf3e60520576135a87f19d510ba168b4..12ba49d3117a37ee50ddfdb66f018b0558309cfe 100644 (file)
--- a/bin/dig/nslookup.c
+++ b/bin/dig/nslookup.c
@@ -849,7 +849,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
@@ -862,7 +862,7 @@ parse_args(int argc, char **argv) {
                if (argv[0][0] == '-') {
                        if (strncasecmp(argv[0], "-ver", 4) == 0) {
                                printf("nslookup %s\n", PACKAGE_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 2e2d8999f19428c771696df105061386a8d37021..ee5bf15069f4eb203a4c0c06b51726da352835ed 100644 (file)
--- a/bin/dnssec/dnssec-cds.c
+++ b/bin/dnssec/dnssec-cds.c
@@ -1056,7 +1056,7 @@ usage(void) {
                        "    -T <ttl>           TTL of DS records\n"
                        "    -V                 print version\n"
                        "    -v <verbosity>\n");
-       exit(1);
+       exit(EXIT_FAILURE);
 }
 
 static void
@@ -1354,5 +1354,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 f8f221ff5ad5bca422ea6060e6e97a007aa11111..7c1a45cbfa8df60db260302cd91ba9b2b883fe7f 100644 (file)
--- a/bin/dnssec/dnssec-dsfromkey.c
+++ b/bin/dnssec/dnssec-dsfromkey.c
@@ -353,7 +353,7 @@ usage(void) {
                        "    -V: print version information\n");
        fprintf(stderr, "Output: DS or CDS RRs\n");
 
-       exit(-1);
+       exit(EXIT_FAILURE);
 }
 
 int
@@ -452,7 +452,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 df01289e193e066aa92775c3c545524cf79ae9f8..e47d44a595332f3e69bb2dcc6f9cd1db1203f846 100644 (file)
--- a/bin/dnssec/dnssec-importkey.c
+++ b/bin/dnssec/dnssec-importkey.c
@@ -289,7 +289,7 @@ usage(void) {
        fprintf(stderr, "    -D sync date/[+-]offset/none: set/unset "
                        "CDS and CDNSKEY deletion date\n");
 
-       exit(-1);
+       exit(EXIT_FAILURE);
 }
 
 int
@@ -395,7 +395,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 9837b545235ea44c44f0631c3170e551ced2855e..8b052aba9b9270f00f47f883eb21b9e337f5dbfd 100644 (file)
--- a/bin/dnssec/dnssec-keyfromlabel.c
+++ b/bin/dnssec/dnssec-keyfromlabel.c
@@ -102,7 +102,7 @@ usage(void) {
        fprintf(stderr, "     K<name>+<alg>+<id>.key, "
                        "K<name>+<alg>+<id>.private\n");
 
-       exit(-1);
+       exit(EXIT_FAILURE);
 }
 
 int
@@ -331,7 +331,7 @@ main(int argc, char **argv) {
                default:
                        fprintf(stderr, "%s: unhandled option -%c\n", program,
                                isc_commandline_option);
-                       exit(1);
+                       exit(EXIT_FAILURE);
                }
        }
 
@@ -606,7 +606,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 7876f3f731cfd06ffd1a4b2b61b990a014363ee9..0a2cadbfe2b1baade4f28b39c66d6552d592b81f 100644 (file)
--- a/bin/dnssec/dnssec-keygen.c
+++ b/bin/dnssec/dnssec-keygen.c
@@ -227,7 +227,7 @@ usage(void) {
        fprintf(stderr, "     K<name>+<alg>+<id>.key, "
                        "K<name>+<alg>+<id>.private\n");
 
-       exit(-1);
+       exit(EXIT_FAILURE);
 }
 
 static void
@@ -1196,7 +1196,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 ada83fd96a53a8b85ef55bdce29fe8046351ebae..cf7f2b74de5c92124d7cac5942dd9fb9c5f484ba 100644 (file)
--- a/bin/dnssec/dnssec-revoke.c
+++ b/bin/dnssec/dnssec-revoke.c
@@ -58,7 +58,7 @@ usage(void) {
        fprintf(stderr, "     K<name>+<alg>+<new id>.key, "
                        "K<name>+<alg>+<new id>.private\n");
 
-       exit(-1);
+       exit(EXIT_FAILURE);
 }
 
 int
@@ -130,7 +130,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 fcd8c0cb53e90e5e2e91fb3985e6bb6d8037a8d3..f19d0781b5e46557f36f34a1ab1ef96038ee47a7 100644 (file)
--- a/bin/dnssec/dnssec-settime.c
+++ b/bin/dnssec/dnssec-settime.c
@@ -101,7 +101,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
@@ -536,7 +536,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 29ae7d578cb3f7d19f1e22fec538c76990e6431f..08081fb144bffa27f8e71c9f65df3622e6a5cbb3 100644 (file)
--- a/bin/dnssec/dnssec-signzone.c
+++ b/bin/dnssec/dnssec-signzone.c
@@ -3300,7 +3300,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
@@ -3550,7 +3550,7 @@ main(int argc, char *argv[]) {
                        if (*endp != '\0') {
                                fprintf(stderr, "source serial number "
                                                "must be numeric");
-                               exit(1);
+                               exit(EXIT_FAILURE);
                        }
                        break;
 
@@ -3565,7 +3565,7 @@ main(int argc, char *argv[]) {
                        if (*endp != '\0') {
                                fprintf(stderr, "maximum TTL "
                                                "must be numeric");
-                               exit(1);
+                               exit(EXIT_FAILURE);
                        }
                        break;
 
@@ -3689,7 +3689,7 @@ main(int argc, char *argv[]) {
                default:
                        fprintf(stderr, "%s: unhandled option -%c\n", program,
                                isc_commandline_option);
-                       exit(1);
+                       exit(EXIT_FAILURE);
                }
        }
 
@@ -3818,7 +3818,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 e6b8972b0241295122de28798ba43a83143a13ab..294a972af895ed7e3b315f6e923e3e6382a4429c 100644 (file)
--- a/bin/dnssec/dnssec-verify.c
+++ b/bin/dnssec/dnssec-verify.c
@@ -162,7 +162,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 60c6e31832b7428851d7b8b1a611fe383078fed2..34552864e66efdfca0a0dba1094cbd2d3a0ef3e4 100644 (file)
--- a/bin/dnssec/dnssectool.c
+++ b/bin/dnssec/dnssectool.c
@@ -117,7 +117,7 @@ vbprintf(int level, const char *fmt, ...) {
 void
 version(const char *name) {
        printf("%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 00ef0e0f7fb045b8490618411c7abde03d633860..b828b3a2ae71dc064ecd16abaeba7e08384a24b9 100644 (file)
--- a/bin/named/main.c
+++ b/bin/named/main.c
@@ -892,7 +892,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 "
@@ -955,10 +955,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;
@@ -993,7 +993,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 4b3cd952bbb9a4500771fece24dfc0ade659eaf0..9efc114479d58a92a237ede51c0472c16efde837 100644 (file)
--- a/bin/named/os.c
+++ b/bin/named/os.c
@@ -428,10 +428,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/nsupdate/nsupdate.c b/bin/nsupdate/nsupdate.c
index 39858f30d05dbba6d58b26c4354888f187062367..bd01da7916f1213e416237db198fa77da8b7ea19 100644 (file)
--- a/bin/nsupdate/nsupdate.c
+++ b/bin/nsupdate/nsupdate.c
@@ -513,7 +513,7 @@ setup_keystr(void) {
                name = secretstr;
                secretstr = n + 1;
                if (!parse_hmac(keystr, s - keystr, &hmac_alg, &digestbits)) {
-                       exit(1);
+                       exit(EXIT_FAILURE);
                }
        } else {
                hmac_alg = DST_ALG_HMACMD5;
@@ -1054,7 +1054,7 @@ pre_parse_args(int argc, char **argv) {
                                        "[-A tlscafile] [-H tlshostname] "
                                        "[-O] ] [-v] [-V] [-P] [-T] [-4 | -6] "
                                        "[filename]\n");
-                       exit(1);
+                       exit(EXIT_FAILURE);
 
                case 'P':
                        for (t = 0xff00; t <= 0xfffe; t++) {
@@ -1092,7 +1092,7 @@ pre_parse_args(int argc, char **argv) {
                }
        }
        if (doexit) {
-               exit(0);
+               exit(EXIT_SUCCESS);
        }
        isc_commandline_reset = true;
        isc_commandline_index = 1;
@@ -1167,7 +1167,7 @@ parse_args(int argc, char **argv) {
                                        "bad library debug value "
                                        "'%s'\n",
                                        isc_commandline_argument);
-                               exit(1);
+                               exit(EXIT_FAILURE);
                        }
                        logdebuglevel = i;
                        break;
@@ -1198,7 +1198,7 @@ parse_args(int argc, char **argv) {
                                        "bad port number "
                                        "'%s'\n",
                                        isc_commandline_argument);
-                               exit(1);
+                               exit(EXIT_FAILURE);
                        }
                        break;
                case 'S':
@@ -1210,7 +1210,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;
@@ -1222,7 +1222,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':
@@ -1231,7 +1231,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;
 
@@ -1242,19 +1242,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) {
@@ -1262,7 +1262,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 */
 
@@ -1275,14 +1275,14 @@ parse_args(int argc, char **argv) {
                                "%s: cannot specify the -K option without"
                                "the -E option, and vice versa.\n",
                                argv[0]);
-                       exit(1);
+                       exit(EXIT_FAILURE);
                }
                if (tls_ca_file != NULL && tls_always_verify_remote == false) {
                        fprintf(stderr,
                                "%s: cannot specify the -A option in "
                                "conjuction with the -O option.\n",
                                argv[0]);
-                       exit(1);
+                       exit(EXIT_FAILURE);
                }
        }
 
@@ -1296,7 +1296,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) {
@@ -2247,7 +2247,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);
@@ -3577,7 +3577,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 645cef5ed01fe10f9c48c28556fa219f696a92f3..2e5ae8eead6a5f139c1fd5ef47d4029228c5dd0b 100644 (file)
--- a/bin/rndc/rndc.c
+++ b/bin/rndc/rndc.c
@@ -932,7 +932,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 b3758498c558c21a76efbc4a9ad309efa1374ec0..b0293eef0a70ae0a94fc517a137c726d71442b50 100644 (file)
--- a/bin/tests/system/pipelined/pipequeries.c
+++ b/bin/tests/system/pipelined/pipequeries.c
@@ -46,7 +46,7 @@
                if ((x) != ISC_R_SUCCESS) {                  \
                        fprintf(stderr, "I:%s: %s\n", (str), \
                                isc_result_totext(x));       \
-                       exit(-1);                            \
+                       exit(EXIT_FAILURE);                  \
                }                                            \
        }
 
@@ -76,7 +76,7 @@ recvresponse(void *arg) {
        if (result != ISC_R_SUCCESS) {
                fprintf(stderr, "I:request event result: %s\n",
                        isc_result_totext(result));
-               exit(-1);
+               exit(EXIT_FAILURE);
        }
 
        dns_message_create(mctx, NULL, NULL, DNS_MESSAGE_INTENTPARSE,
@@ -90,7 +90,7 @@ recvresponse(void *arg) {
                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",
@@ -234,7 +234,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/rpz/dnsrps.c b/bin/tests/system/rpz/dnsrps.c
index 167433f1e19e89d3c0658873727c16062c7e62f1..87ff5d008ac78b601f5a917a81e9ea71d9d9d39b 100644 (file)
--- a/bin/tests/system/rpz/dnsrps.c
+++ b/bin/tests/system/rpz/dnsrps.c
@@ -12,7 +12,7 @@
  */
 
 /*
- * -a          exit(0) if dnsrps is available or dlopen() msg if not
+ * -a          exit(EXIT_SUCCESS) if dnsrps is available or dlopen() msg if not
  * -n domain   print the serial number of a domain to check if a new
  *                 version of a policy zone is ready.
  *                 Exit(1) if dnsrps is not available

diff --git a/bin/tests/system/rsabigexponent/bigkey.c b/bin/tests/system/rsabigexponent/bigkey.c
index c1234df18fbc59dfb77db28ed91943258cb99f2d..3c3fda0912843af04e2a4a4d89e7b82dafb39197 100644 (file)
--- a/bin/tests/system/rsabigexponent/bigkey.c
+++ b/bin/tests/system/rsabigexponent/bigkey.c
@@ -67,7 +67,7 @@ EVP_PKEY *pkey;
                                msg, isc_result_totext(result), __FILE__,     \
                                __LINE__);                                    \
                        ERR_clear_error();                                    \
-                       exit(1);                                              \
+                       exit(EXIT_FAILURE);                                   \
                }                                                             \
        } while (0)
 
@@ -85,7 +85,7 @@ main(int argc, char **argv) {
        {
                fprintf(stderr, "fatal error: basic OpenSSL failure\n");
                ERR_clear_error();
-               exit(1);
+               exit(EXIT_FAILURE);
        }
 
        /* e = 0x1000000000001 */
@@ -101,7 +101,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/test_client.c b/bin/tests/test_client.c
index 09bcebc859020fb33c72e02a9edbb2612029132a..b570e5ff2c7d35afa78ebe1478d137bc5d470d7d 100644 (file)
--- a/bin/tests/test_client.c
+++ b/bin/tests/test_client.c
@@ -428,5 +428,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 d101b6328f7b4e8295fd0ff9b1ebefb0a4a68da9..124074e51a7ce10df34c1e6bcfbf2bb916e043f6 100644 (file)
--- a/bin/tests/test_server.c
+++ b/bin/tests/test_server.c
@@ -303,5 +303,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 21c960ebed1b20f28d6a48e34b1af86c896ebe48..e2e6b43221a36788788ff1ea0702a9a5fca5fb77 100644 (file)
--- a/bin/tests/wire_test.c
+++ b/bin/tests/wire_test.c
@@ -41,7 +41,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);
        }
 }
 
@@ -163,7 +163,7 @@ main(int argc, char *argv[]) {
                        break;
                default:
                        usage();
-                       exit(1);
+                       exit(EXIT_FAILURE);
                }
        }
 
@@ -174,7 +174,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 {
@@ -214,7 +214,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;
@@ -239,13 +239,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 d66f829f2bc75c7735de6a7f1e1482da8e0da309..1df44dad6f94479f37f3bb7a70ef02c54ebeb33f 100644 (file)
--- a/bin/tools/dnstap-read.c
+++ b/bin/tools/dnstap-read.c
@@ -361,7 +361,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 8fb98e9f742daf8f6a0ecb2ebe718e286286edcb..915d543691dedf25b8df891d8e3ea3131a7cd015 100644 (file)
--- a/bin/tools/mdig.c
+++ b/bin/tools/mdig.c
@@ -56,7 +56,7 @@
                if ((x) != ISC_R_SUCCESS) {                                 \
                        fprintf(stderr, "mdig: %s failed with %s\n", (str), \
                                isc_result_totext(x));                      \
-                       exit(-1);                                           \
+                       exit(EXIT_FAILURE);                                 \
                }                                                           \
        }
 
@@ -207,7 +207,7 @@ recvresponse(void *arg) {
                if (continue_on_error) {
                        goto cleanup;
                } else {
-                       exit(-1);
+                       exit(EXIT_FAILURE);
                }
        }
 
@@ -785,7 +785,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 */
@@ -1690,7 +1690,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':
                        fatal("-%c removed", opt);
@@ -1701,7 +1701,7 @@ dash_option(const char *option, char *next, struct query *query, bool global,
                        break;
                case 'v':
                        printf("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 11d3cd8784e3607b4f71a02d8a6db4a239224456..ce6c3816d0befae288d02eb33dbe289f0fbc7486 100644 (file)
--- a/bin/tools/named-journalprint.c
+++ b/bin/tools/named-journalprint.c
@@ -30,7 +30,7 @@ const char *progname = NULL;
 static void
 usage(void) {
        fprintf(stderr, "Usage: %s [-dux] journal\n", progname);
-       exit(1);
+       exit(EXIT_FAILURE);
 }
 
 /*
@@ -84,7 +84,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 9f3b440eca31aa4cb724014a05ef14eb0d4a003b..5c2959a1e35d442c3dea797443306e0e4863fa67 100644 (file)
--- a/bin/tools/named-nzd2nzf.c
+++ b/bin/tools/named-nzd2nzf.c
@@ -33,7 +33,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];
@@ -42,35 +42,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);
@@ -84,7 +84,7 @@ main(int argc, char *argv[]) {
                                "named-nzd2nzf: empty column found in "
                                "database '%s'",
                                path);
-                       exit(1);
+                       exit(EXIT_FAILURE);
                }
 
                /* zone zonename { config; }; */
@@ -96,5 +96,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 19e59f1e4ceeb8d4e78ba89bce25157dcc586e24..563c623be4d1a9f2e0cb81a26a9e3b03f2c99ebc 100644 (file)
--- a/bin/tools/named-rrchecker.c
+++ b/bin/tools/named-rrchecker.c
@@ -49,7 +49,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
@@ -125,7 +125,7 @@ main(int argc, char *argv[]) {
                                        fprintf(stdout, "%s\n", text);
                                }
                        }
-                       exit(0);
+                       exit(EXIT_SUCCESS);
 
                case 'P':
                        for (t = 0xff00; t <= 0xfffeu; t++) {
@@ -161,11 +161,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 b114c0280e7453dba2e39e8cbc61121e2d15cb0e..046c8b7894e50a8640734dde16a542e2a24a174f 100644 (file)
--- a/bin/tools/nsec3hash.c
+++ b/bin/tools/nsec3hash.c
@@ -49,7 +49,7 @@ fatal(const char *format, ...) {
        va_end(args);
        fprintf(stderr, "\n");
        isc__tls_setfatalmode();
-       _exit(1);
+       _exit(EXIT_FAILURE);
 }
 
 static void
@@ -65,7 +65,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 439c9cf1d5fd991e12db9509214160a1f6ee70d7..e5e62c8cd5864645314f9286680d3a40bf8db590 100644 (file)
--- a/doc/misc/cfg_test.c
+++ b/doc/misc/cfg_test.c
@@ -38,7 +38,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
@@ -52,7 +52,7 @@ usage(void) {
        fprintf(stderr, "usage: cfg_test --rndc|--named "
                        "[--grammar] [--zonegrammar] [--active] "
                        "[--memstats] conffile\n");
-       exit(1);
+       exit(EXIT_FAILURE);
 }
 
 int
@@ -166,7 +166,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);
@@ -186,7 +186,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 7f690ce9ab2a982f2d98f81b31b132c9f6084d4c..120b13cc706fcdfa7e91bb0ab31787953dac8b18 100644 (file)
--- a/lib/dns/gen.c
+++ b/lib/dns/gen.c
@@ -218,7 +218,7 @@ next_file(isc_dir_t *dir) {
                                fprintf(stderr,
                                        "Error: reading directory: %s\n",
                                        strerror(errno));
-                               exit(1);
+                               exit(EXIT_FAILURE);
                        }
                }
        }
@@ -366,14 +366,14 @@ 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);
                }
                ttn = &typenames[i];
        }
        /* Subtract one to leave an empty sentinel entry at the end */
        if (i >= TYPENAMES - 1) {
                fprintf(stderr, "Error: typenames array too small\n");
-               exit(1);
+               exit(EXIT_FAILURE);
        } else if (ttn == NULL) {
                ttn = &typenames[i];
                ttnam_count = i + 1;
@@ -382,7 +382,7 @@ insert_into_typenames(int type, const char *typebuf, const char *attr) {
        /* 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));
@@ -412,13 +412,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));
@@ -444,7 +444,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;
@@ -496,7 +496,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));
@@ -554,7 +554,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);
        }
@@ -638,7 +638,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 int)n < sizeof(srcdir));
@@ -653,7 +653,7 @@ main(int argc, char **argv) {
                        suffix = optarg;
                        break;
                case '?':
-                       exit(1);
+                       exit(EXIT_FAILURE);
                }
        }
 
@@ -682,7 +682,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);
        }
@@ -1023,7 +1023,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 424657b1b2849af33ee5513d3bbe1b6a4b67dfe9..d8191b1f0561cb9998f8ff6e36dec0a26f7f2672 100644 (file)
--- a/lib/dns/openssl_link.c
+++ b/lib/dns/openssl_link.c
@@ -74,7 +74,7 @@ enable_fips_mode(void) {
 
        if (isc_fips_set_mode(1) != ISC_R_SUCCESS) {
                dst__openssl_toresult2("FIPS_mode_set", DST_R_OPENSSLFAILURE);
-               exit(1);
+               exit(EXIT_FAILURE);
        }
 #endif
 }

diff --git a/tests/bench/compress.c b/tests/bench/compress.c
index 88c25f4d90bf55c601e3f43f5f1d85025d7f12eb..f255d298a2d09909ac3bf859f9c11ffd1f5caaf3 100644 (file)
--- a/tests/bench/compress.c
+++ b/tests/bench/compress.c
@@ -31,7 +31,7 @@ static void
 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);
        }
 }
 

diff --git a/tests/bench/load-names.c b/tests/bench/load-names.c
index 0e5512e69b56d47c2b62ee2e834abef2f30d5249..f4562aa6db2ce5db86cf8966f91006d2d9606cd3 100644 (file)
--- a/tests/bench/load-names.c
+++ b/tests/bench/load-names.c
@@ -87,7 +87,7 @@ const dns_qpmethods_t qpmethods = {
                        dns_name_format(name, buf, sizeof(buf));    \
                        fprintf(stderr, "%s: %s\n", buf,            \
                                isc_result_totext(result));         \
-                       exit(1);                                    \
+                       exit(EXIT_FAILURE);                         \
                }                                                   \
        } while (0)
 
@@ -459,7 +459,7 @@ static struct fun fun_list[] = {
        do {                                                                   \
                if (!(check)) {                                                \
                        fprintf(stderr, "%s:%zu: %s\n", filename, lines, msg); \
-                       exit(1);                                               \
+                       exit(EXIT_FAILURE);                                    \
                }                                                              \
        } while (0)
 
@@ -480,7 +480,7 @@ main(int argc, char *argv[]) {
        if (argc != 2) {
                fprintf(stderr,
                        "usage: load-names <filename.csv> <nthreads>\n");
-               exit(1);
+               exit(EXIT_FAILURE);
        }
 
        filename = argv[1];
@@ -488,7 +488,7 @@ main(int argc, char *argv[]) {
        if (result != ISC_R_SUCCESS) {
                fprintf(stderr, "stat(%s): %s\n", filename,
                        isc_result_totext(result));
-               exit(1);
+               exit(EXIT_FAILURE);
        }
        filesize = (size_t)fileoff;
 
@@ -496,7 +496,7 @@ main(int argc, char *argv[]) {
        fp = fopen(filename, "r");
        if (fp == NULL || fread(filetext, 1, filesize, fp) < filesize) {
                fprintf(stderr, "read(%s): %s\n", filename, strerror(errno));
-               exit(1);
+               exit(EXIT_FAILURE);
        }
        fclose(fp);
        filetext[filesize] = '\0';

diff --git a/tests/bench/qp-dump.c b/tests/bench/qp-dump.c
index 9b8865b92776ea7028d8f17b4a084694fcbf436f..0142eb3d9b40702fe7dc978d497cbd8080dd9e3e 100644 (file)
--- a/tests/bench/qp-dump.c
+++ b/tests/bench/qp-dump.c
@@ -152,7 +152,7 @@ main(int argc, char *argv[]) {
                        continue;
                default:
                        usage();
-                       exit(1);
+                       exit(EXIT_FAILURE);
                        continue;
                }
        }
@@ -162,7 +162,7 @@ main(int argc, char *argv[]) {
        if (argc != 1) {
                /* must exit 0 to appease test runner */
                usage();
-               exit(0);
+               exit(EXIT_SUCCESS);
        }
 
        isc_mem_create(&mctx);
@@ -172,7 +172,7 @@ main(int argc, char *argv[]) {
        if (result != ISC_R_SUCCESS) {
                fprintf(stderr, "stat(%s): %s\n", filename,
                        isc_result_totext(result));
-               exit(1);
+               exit(EXIT_FAILURE);
        }
 
        filesize = (size_t)fileoff;
@@ -180,7 +180,7 @@ main(int argc, char *argv[]) {
        fp = fopen(filename, "r");
        if (fp == NULL || fread(filetext, 1, filesize, fp) < filesize) {
                fprintf(stderr, "read(%s): %s\n", filename, strerror(errno));
-               exit(1);
+               exit(EXIT_FAILURE);
        }
        fclose(fp);
        filetext[filesize] = '\0';
@@ -220,7 +220,7 @@ main(int argc, char *argv[]) {
                if (result != ISC_R_SUCCESS) {
                        fprintf(stderr, "%s:%zu: %s %s\n", filename, names,
                                domain, isc_result_totext(result));
-                       exit(1);
+                       exit(EXIT_FAILURE);
                }
 
                wirebytes += name->length;

diff --git a/tests/bench/qplookups.c b/tests/bench/qplookups.c
index be85825ec3da19dbe5879a5882048e7adecaae95..12a54f2ad473be03588e82dac894abae007a918a 100644 (file)
--- a/tests/bench/qplookups.c
+++ b/tests/bench/qplookups.c
@@ -124,7 +124,7 @@ const dns_qpmethods_t methods = {
 static void
 usage(void) {
        fprintf(stderr, "usage: lookups <filename>\n");
-       exit(0);
+       exit(EXIT_FAILURE);
 }
 
 static size_t
@@ -140,7 +140,7 @@ load_qp(dns_qp_t *qp, const char *filename) {
        if (result != ISC_R_SUCCESS) {
                fprintf(stderr, "stat(%s): %s\n", filename,
                        isc_result_totext(result));
-               exit(1);
+               exit(EXIT_FAILURE);
        }
 
        filesize = (size_t)fileoff;
@@ -148,7 +148,7 @@ load_qp(dns_qp_t *qp, const char *filename) {
        fp = fopen(filename, "r");
        if (fp == NULL || fread(filetext, 1, filesize, fp) < filesize) {
                fprintf(stderr, "read(%s): %s\n", filename, strerror(errno));
-               exit(1);
+               exit(EXIT_FAILURE);
        }
        fclose(fp);
        filetext[filesize] = '\0';
@@ -186,7 +186,7 @@ load_qp(dns_qp_t *qp, const char *filename) {
                if (result != ISC_R_SUCCESS) {
                        fprintf(stderr, "%s:%zu: %s %s\n", filename, names,
                                domain, isc_result_totext(result));
-                       exit(1);
+                       exit(EXIT_FAILURE);
                }
 
                names++;