From f6754349781d86adcd749e6ef90bb4074f18ba65 Mon Sep 17 00:00:00 2001 From: David Lawrence Date: Mon, 8 May 2000 20:12:46 +0000 Subject: [PATCH] return rather than exit from main() to shut up HP/UX --- bin/dnssec/dnssec-keygen.c | 5 +++-- bin/tests/compress_test.c | 2 +- bin/tests/dispatch_tcp_test.c | 24 ++++++++---------------- bin/tests/dst/dst_test.c | 2 +- bin/tests/inter_test.c | 3 ++- bin/tests/keygen.c | 5 +++-- bin/tests/log_test.c | 4 ++-- bin/tests/ndcconf_test.c | 8 +++----- bin/tests/zone2_test.c | 2 +- 9 files changed, 24 insertions(+), 31 deletions(-) diff --git a/bin/dnssec/dnssec-keygen.c b/bin/dnssec/dnssec-keygen.c index bc51262831..160de9bf7d 100644 --- a/bin/dnssec/dnssec-keygen.c +++ b/bin/dnssec/dnssec-keygen.c @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THE SOFTWARE. */ -/* $Id: dnssec-keygen.c,v 1.15 2000/05/08 14:33:32 tale Exp $ */ +/* $Id: dnssec-keygen.c,v 1.16 2000/05/08 20:12:41 tale Exp $ */ #include @@ -264,7 +264,8 @@ main(int argc, char **argv) { isc_mem_free(mctx, type); dst_key_free(key); isc_mem_destroy(&mctx); - exit(0); + + return (0); } static isc_boolean_t diff --git a/bin/tests/compress_test.c b/bin/tests/compress_test.c index bc48a038a0..821f29086c 100644 --- a/bin/tests/compress_test.c +++ b/bin/tests/compress_test.c @@ -108,7 +108,7 @@ main(int argc, char *argv[]) { test(DNS_COMPRESS_GLOBAL, &name1, &name2, &name3, bit, sizeof bit); test(DNS_COMPRESS_ALL, &name1, &name2, &name3, bit, sizeof bit); - exit(0); + return (0); } void diff --git a/bin/tests/dispatch_tcp_test.c b/bin/tests/dispatch_tcp_test.c index 233c011b4d..22e2c5c38f 100644 --- a/bin/tests/dispatch_tcp_test.c +++ b/bin/tests/dispatch_tcp_test.c @@ -52,8 +52,7 @@ void send_done(isc_task_t *, isc_event_t *); void hex_dump(isc_buffer_t *); void -hex_dump(isc_buffer_t *b) -{ +hex_dump(isc_buffer_t *b) { unsigned int len; isc_region_t r; @@ -70,8 +69,7 @@ hex_dump(isc_buffer_t *b) } static inline void -CHECKRESULT(isc_result_t result, char *msg) -{ +CHECKRESULT(isc_result_t result, char *msg) { if (result != ISC_R_SUCCESS) { printf("%s: %s\n", msg, isc_result_totext(result)); @@ -80,8 +78,7 @@ CHECKRESULT(isc_result_t result, char *msg) } void -my_accept(isc_task_t *task, isc_event_t *ev_in) -{ +my_accept(isc_task_t *task, isc_event_t *ev_in) { isc_socket_newconnev_t *ev = (isc_socket_newconnev_t *)ev_in; dns_dispentry_t *resp; @@ -109,8 +106,7 @@ my_accept(isc_task_t *task, isc_event_t *ev_in) } void -send_done(isc_task_t *task, isc_event_t *ev_in) -{ +send_done(isc_task_t *task, isc_event_t *ev_in) { isc_socketevent_t *ev = (isc_socketevent_t *)ev_in; dns_dispentry_t *resp = (dns_dispentry_t *)ev_in->ev_arg; @@ -132,8 +128,7 @@ send_done(isc_task_t *task, isc_event_t *ev_in) } void -start_response(void) -{ +start_response(void) { dns_dispentry_t *resp; dns_messageid_t id; isc_sockaddr_t from; @@ -234,8 +229,7 @@ start_response(void) } void -got_response(isc_task_t *task, isc_event_t *ev_in) -{ +got_response(isc_task_t *task, isc_event_t *ev_in) { dns_dispatchevent_t *ev = (dns_dispatchevent_t *)ev_in; dns_dispentry_t *resp = ev->ev_sender; dns_message_t *msg; @@ -265,8 +259,7 @@ got_response(isc_task_t *task, isc_event_t *ev_in) } void -got_request(isc_task_t *task, isc_event_t *ev_in) -{ +got_request(isc_task_t *task, isc_event_t *ev_in) { dns_dispatchevent_t *ev = (dns_dispatchevent_t *)ev_in; dns_dispentry_t *resp = ev->ev_sender; static int cnt = 0; @@ -326,8 +319,7 @@ got_request(isc_task_t *task, isc_event_t *ev_in) } int -main(int argc, char *argv[]) -{ +main(int argc, char *argv[]) { isc_socket_t *s0; isc_sockaddr_t sockaddr; diff --git a/bin/tests/dst/dst_test.c b/bin/tests/dst/dst_test.c index 247f0456c6..cdaf1ab316 100644 --- a/bin/tests/dst/dst_test.c +++ b/bin/tests/dst/dst_test.c @@ -237,5 +237,5 @@ main() { /* isc_mem_stats(mctx, stdout);*/ isc_mem_destroy(&mctx); - exit(0); + return (0); } diff --git a/bin/tests/inter_test.c b/bin/tests/inter_test.c index 5b917a30fd..95fb25f486 100644 --- a/bin/tests/inter_test.c +++ b/bin/tests/inter_test.c @@ -76,5 +76,6 @@ main(int argc, char **argv) { isc_interfaceiter_destroy(&iter); cleanup: isc_mem_destroy(&mctx); - exit(0); + + return (0); } diff --git a/bin/tests/keygen.c b/bin/tests/keygen.c index 4a78670924..d570724a13 100644 --- a/bin/tests/keygen.c +++ b/bin/tests/keygen.c @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THE SOFTWARE. */ -/* $Id: keygen.c,v 1.15 2000/05/08 14:33:32 tale Exp $ */ +/* $Id: keygen.c,v 1.16 2000/05/08 20:12:41 tale Exp $ */ #include @@ -264,7 +264,8 @@ main(int argc, char **argv) { isc_mem_free(mctx, type); dst_key_free(key); isc_mem_destroy(&mctx); - exit(0); + + return (0); } static isc_boolean_t diff --git a/bin/tests/log_test.c b/bin/tests/log_test.c index 7658049a99..24929c49fe 100644 --- a/bin/tests/log_test.c +++ b/bin/tests/log_test.c @@ -15,7 +15,7 @@ * SOFTWARE. */ -/* $Id: log_test.c,v 1.14 2000/05/08 14:33:37 tale Exp $ */ +/* $Id: log_test.c,v 1.15 2000/05/08 20:12:42 tale Exp $ */ /* Principal Authors: DCL */ @@ -331,5 +331,5 @@ main (int argc, char **argv) { if (show_final_mem) isc_mem_stats(mctx, stderr); - exit(0); + return (0); } diff --git a/bin/tests/ndcconf_test.c b/bin/tests/ndcconf_test.c index 9b3cd9f670..2ea604485d 100644 --- a/bin/tests/ndcconf_test.c +++ b/bin/tests/ndcconf_test.c @@ -27,7 +27,8 @@ #include -int main (int argc, char **argv) { +int +main(int argc, char **argv) { dns_c_ndcctx_t *ndcctx = NULL; const char *conffile; isc_mem_t *mem = NULL; @@ -80,7 +81,4 @@ int main (int argc, char **argv) { return (0); } - - - - + diff --git a/bin/tests/zone2_test.c b/bin/tests/zone2_test.c index 3df1a92abd..1a10f97415 100644 --- a/bin/tests/zone2_test.c +++ b/bin/tests/zone2_test.c @@ -421,5 +421,5 @@ main(int argc, char **argv) { isc_mem_stats(mctx, stdout); isc_mem_destroy(&mctx); - exit(0); + return (0); }