From: Arran Cudbard-Bell Date: Wed, 6 Nov 2019 17:51:33 +0000 (-0600) Subject: Fix return code check X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7b0bf76895032dba4f5ea5b88402bbe0d2fd8552;p=thirdparty%2Ffreeradius-server.git Fix return code check --- diff --git a/src/bin/fuzzer.c b/src/bin/fuzzer.c index e9ca57bcb0d..5c941f42d6f 100644 --- a/src/bin/fuzzer.c +++ b/src/bin/fuzzer.c @@ -53,7 +53,7 @@ int LLVMFuzzerInitialize(UNUSED int *argc, UNUSED char ***argv) if (!dict_dir) dict_dir = DICTDIR; - if (fr_dict_global_init(NULL, dict_dir) < 0) { + if (!fr_dict_global_init(NULL, dict_dir)) { fr_perror("dict_global"); return 0; } diff --git a/src/bin/radclient.c b/src/bin/radclient.c index 87d9e968de1..41cbe314d8d 100644 --- a/src/bin/radclient.c +++ b/src/bin/radclient.c @@ -1370,7 +1370,7 @@ int main(int argc, char **argv) return 1; } - if (fr_dict_global_init(autofree, dict_dir) < 0) { + if (!fr_dict_global_init(autofree, dict_dir)) { fr_perror("radclient"); return 1; } diff --git a/src/bin/radict.c b/src/bin/radict.c index cd5f436f740..00eaea9a3c9 100644 --- a/src/bin/radict.c +++ b/src/bin/radict.c @@ -240,7 +240,7 @@ int main(int argc, char *argv[]) goto finish; } - if (fr_dict_global_init(autofree, dict_dir) < 0) { + if (!fr_dict_global_init(autofree, dict_dir)) { fr_perror("radict"); ret = 1; goto finish; diff --git a/src/bin/radiusd.c b/src/bin/radiusd.c index 51b30857e32..c3a6e12c83e 100644 --- a/src/bin/radiusd.c +++ b/src/bin/radiusd.c @@ -495,7 +495,7 @@ int main(int argc, char *argv[]) * Initialise the top level dictionary hashes which hold * the protocols. */ - if (fr_dict_global_init(global_ctx, config->dict_dir) < 0) { + if (!fr_dict_global_init(global_ctx, config->dict_dir)) { fr_perror("%s", program); EXIT_WITH_FAILURE; } diff --git a/src/bin/radsniff.c b/src/bin/radsniff.c index 552a07b6244..e8a0811d9c2 100644 --- a/src/bin/radsniff.c +++ b/src/bin/radsniff.c @@ -2561,7 +2561,7 @@ int main(int argc, char *argv[]) conf->pcap_filter, conf->pcap_filter); } - if (fr_dict_global_init(conf, dict_dir) < 0) { + if (!fr_dict_global_init(conf, dict_dir)) { fr_perror("radsniff"); exit(EXIT_FAILURE); } diff --git a/src/bin/radwho.c b/src/bin/radwho.c index 0485ca5cfba..05f773e7ee9 100644 --- a/src/bin/radwho.c +++ b/src/bin/radwho.c @@ -299,7 +299,7 @@ int main(int argc, char **argv) return 1; } - if (fr_dict_global_init(autofree, config->dict_dir) < 0) { + if (!fr_dict_global_init(autofree, config->dict_dir)) { fr_perror("%s", main_config->name); exit(EXIT_FAILURE); } diff --git a/src/bin/unit_test_attribute.c b/src/bin/unit_test_attribute.c index d79f6762e40..339fb43cfdf 100644 --- a/src/bin/unit_test_attribute.c +++ b/src/bin/unit_test_attribute.c @@ -2286,7 +2286,7 @@ int main(int argc, char *argv[]) EXIT_WITH_FAILURE; } - if (fr_dict_global_init(autofree, dict_dir) < 0) { + if (!fr_dict_global_init(autofree, dict_dir)) { fr_perror("unit_test_attribute"); EXIT_WITH_FAILURE; } diff --git a/src/bin/unit_test_map.c b/src/bin/unit_test_map.c index 1581b902e07..55efa88f68a 100644 --- a/src/bin/unit_test_map.c +++ b/src/bin/unit_test_map.c @@ -204,7 +204,7 @@ int main(int argc, char *argv[]) EXIT_WITH_FAILURE; } - if (fr_dict_global_init(autofree, dict_dir) < 0) { + if (!fr_dict_global_init(autofree, dict_dir)) { fr_perror("unit_test_map"); EXIT_WITH_FAILURE; } diff --git a/src/bin/unit_test_module.c b/src/bin/unit_test_module.c index 4f7edad2769..fa0e51e2133 100644 --- a/src/bin/unit_test_module.c +++ b/src/bin/unit_test_module.c @@ -746,7 +746,7 @@ int main(int argc, char *argv[]) EXIT_WITH_FAILURE; } - if (fr_dict_global_init(autofree, config->dict_dir) < 0) { + if (!fr_dict_global_init(autofree, config->dict_dir)) { fr_perror("%s", config->name); EXIT_WITH_FAILURE; } diff --git a/src/modules/proto_control/radmin.c b/src/modules/proto_control/radmin.c index 4b33498f37c..c7ac24fc1ee 100644 --- a/src/modules/proto_control/radmin.c +++ b/src/modules/proto_control/radmin.c @@ -950,7 +950,7 @@ int main(int argc, char **argv) * Need to read in the dictionaries, else we may get * validation errors when we try and parse the config. */ - if (fr_dict_global_init(autofree, dict_dir) < 0) { + if (!fr_dict_global_init(autofree, dict_dir)) { fr_perror("radmin"); exit(64); } diff --git a/src/modules/proto_dhcpv4/dhcpclient.c b/src/modules/proto_dhcpv4/dhcpclient.c index 67d2545d185..eaf028c584e 100644 --- a/src/modules/proto_dhcpv4/dhcpclient.c +++ b/src/modules/proto_dhcpv4/dhcpclient.c @@ -662,7 +662,7 @@ int main(int argc, char **argv) if (argc < 2) usage(); - if (fr_dict_global_init(autofree, dict_dir) < 0) { + if (!fr_dict_global_init(autofree, dict_dir)) { fr_perror("dhcpclient"); exit(EXIT_FAILURE); } diff --git a/src/modules/proto_ldap_sync/sync_touch.c b/src/modules/proto_ldap_sync/sync_touch.c index cceed73b9a2..140ffee0705 100644 --- a/src/modules/proto_ldap_sync/sync_touch.c +++ b/src/modules/proto_ldap_sync/sync_touch.c @@ -133,7 +133,7 @@ int main(int argc, char **argv) exit(EXIT_FAILURE); } - if (fr_dict_global_init(autofree, dict_dir) < 0) { + if (!fr_dict_global_init(autofree, dict_dir)) { fr_perror("sync_touch"); exit(EXIT_FAILURE); }