mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-22 10:10:06 +00:00
Code Issues Releases Wiki Activity

Use EXIT_SUCCESS and EXIT_FAILURE

Browse Source 
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).
This commit is contained in:
Ondřej Surý 2024-02-07 14:50:38 +01:00
parent e140743e6a
commit 76997983fd
No known key found for this signature in database
GPG Key ID: 2820F37E873DEA41
41 changed files with 153 additions and 150 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/check/named-checkconf.c
View File

@ -63,7 +63,7 @@ usage(void) {
"usage: %s [-achijlvz] [-p [-x]] [-t directory] "
"[named.conf]\n",
program);
exit(1);
exit(EXIT_SUCCESS);
}
/*% directory callback */

2
bin/check/named-checkzone.c
View File

@ -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;

11
bin/confgen/rndc-confgen.c
View File

@ -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) {

20
bin/confgen/tsig-keygen.c
View File

@ -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 */

10
bin/delv/delv.c
View File

@ -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:

8
bin/dig/dig.c
View File

@ -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:

4
bin/dig/host.c
View File

@ -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;

4
bin/dig/nslookup.c
View File

@ -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 {

5
bin/dnssec/dnssec-cds.c
View File

@ -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);
}

4
bin/dnssec/dnssec-dsfromkey.c
View File

@ -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);
}
}

4
bin/dnssec/dnssec-importkey.c
View File

@ -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);
}
}

6
bin/dnssec/dnssec-keyfromlabel.c
View File

@ -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);
}
/*

4
bin/dnssec/dnssec-keygen.c
View File

@ -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);
}
}

4
bin/dnssec/dnssec-revoke.c
View File

@ -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);
}
}

4
bin/dnssec/dnssec-settime.c
View File

@ -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);
}
}

10
bin/dnssec/dnssec-signzone.c
View File

@ -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);

4
bin/dnssec/dnssec-verify.c
View File

@ -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);
}
}

2
bin/dnssec/dnssectool.c
View File

@ -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

8
bin/named/main.c
View File

@ -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 != ':') {

4
bin/named/os.c
View File

@ -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]);

36
bin/nsupdate/nsupdate.c
View File

@ -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);
}
}

2
bin/rndc/rndc.c
View File

@ -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);
}
}

8
bin/tests/system/pipelined/pipequeries.c
View File

@ -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':

2
bin/tests/system/rpz/dnsrps.c
View File

@ -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

6
bin/tests/system/rsabigexponent/bigkey.c
View File

@ -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);

2
bin/tests/test_client.c
View File

@ -428,5 +428,5 @@ main(int argc, char **argv) {
teardown();
exit(EXIT_SUCCESS);
return (EXIT_SUCCESS);
}

2
bin/tests/test_server.c
View File

@ -303,5 +303,5 @@ main(int argc, char **argv) {
teardown();
exit(EXIT_SUCCESS);
return (EXIT_SUCCESS);
}

12
bin/tests/wire_test.c
View File

@ -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);
}

2
bin/tools/dnstap-read.c
View File

@ -361,7 +361,7 @@ main(int argc, char *argv[]) {
break;
default:
usage();
exit(1);
exit(EXIT_FAILURE);
}
}

10
bin/tools/mdig.c
View File

@ -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) {

4
bin/tools/named-journalprint.c
View File

@ -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':

17
bin/tools/named-nzd2nzf.c
View File

@ -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);
}

8
bin/tools/named-rrchecker.c
View File

@ -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);

4
bin/tools/nsec3hash.c
View File

@ -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

10
doc/misc/cfg_test.c
View File

@ -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);
}
}

26
lib/dns/gen.c
View File

@ -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);

2
lib/dns/openssl_link.c
View File

@ -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
}

2
tests/bench/compress.c
View File

@ -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);
}
}

10
tests/bench/load-names.c
View File

@ -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';

10
tests/bench/qp-dump.c
View File

@ -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;

8
tests/bench/qplookups.c
View File

@ -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++;