From ba238ab374448cc2cda2b0c363bbfd4c061e3701 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Wed, 18 Apr 2018 14:00:17 +1000 Subject: [PATCH 1/3] use %u instead of %d for unsigned int arguments (cherry picked from commit 49f8e9571c8ceecea01cf1a96b2d98ff3dc672a7) --- lib/dns/tests/name_test.c | 2 +- lib/isc/tests/task_test.c | 2 +- lib/isc/tests/timer_test.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/dns/tests/name_test.c b/lib/dns/tests/name_test.c index c1ca74012a..42613f89b8 100644 --- a/lib/dns/tests/name_test.c +++ b/lib/dns/tests/name_test.c @@ -542,7 +542,7 @@ ATF_TC_BODY(countlabels, tc) { NULL, 0, NULL); ATF_REQUIRE_EQ(result, ISC_R_SUCCESS); - printf("%s: expect %d labels\n", + printf("%s: expect %u labels\n", testcases[i].namestr, testcases[i].expect); ATF_REQUIRE_EQ(dns_name_countlabels(name), diff --git a/lib/isc/tests/task_test.c b/lib/isc/tests/task_test.c index 2862603e75..49615f9b4a 100644 --- a/lib/isc/tests/task_test.c +++ b/lib/isc/tests/task_test.c @@ -1135,7 +1135,7 @@ test_purge(int sender, int type, int tag, int exp_purged) { /* * We're testing isc_task_purge. */ - printf("purge events %p,%d,%p\n", + printf("purge events %p,%u,%p\n", purge_sender, purge_type_first, purge_tag); purged = isc_task_purge(task, purge_sender, (isc_eventtype_t)purge_type_first, diff --git a/lib/isc/tests/timer_test.c b/lib/isc/tests/timer_test.c index c707ef8fdf..986cc110a8 100644 --- a/lib/isc/tests/timer_test.c +++ b/lib/isc/tests/timer_test.c @@ -138,8 +138,8 @@ ticktock(isc_task_t *task, isc_event_t *event) { } if (event->ev_type != expected_event_type) { - printf("expected event type %d, got %d\n", - expected_event_type, (int) event->ev_type); + printf("expected event type %u, got %u\n", + expected_event_type, event->ev_type); } result = isc_time_now(&now); From 53e39ca0eab5ccbc9589ed94b4f8e1b206db2554 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Wed, 18 Apr 2018 14:18:05 +1000 Subject: [PATCH 2/3] remove dead code (cherry picked from commit 686edad5c50d9c9b00b15f85e136020c89844b29) --- bin/named/win32/ntservice.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/bin/named/win32/ntservice.c b/bin/named/win32/ntservice.c index 388eaab530..5b7af72de3 100644 --- a/bin/named/win32/ntservice.c +++ b/bin/named/win32/ntservice.c @@ -9,8 +9,6 @@ * information regarding copyright ownership. */ -/* $Id: ntservice.c,v 1.16 2011/01/13 08:50:29 tbox Exp $ */ - #include #include @@ -48,8 +46,6 @@ ntservice_init(void) { if (!hServiceStatus) { named_main_earlyfatal( "could not register service control handler"); - UpdateSCM(SERVICE_STOPPED); - exit(1); } UpdateSCM(SERVICE_RUNNING); } else { From 77643775c5abe2ca5c07b9f4e7a9693451fc664a Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Wed, 18 Apr 2018 14:18:08 +1000 Subject: [PATCH 3/3] remove exit calls after FATAL_ERROR (cherry picked from commit f8d2a46daa545f764eca2739fb8efa86d5ab2d85) --- lib/isc/win32/socket.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/lib/isc/win32/socket.c b/lib/isc/win32/socket.c index 3e54988e94..49dba89e1d 100644 --- a/lib/isc/win32/socket.c +++ b/lib/isc/win32/socket.c @@ -9,8 +9,6 @@ * information regarding copyright ownership. */ -/* $Id$ */ - /* This code uses functions which are only available on Server 2003 and * higher, and Windows XP and higher. * @@ -498,7 +496,6 @@ iocompletionport_createthreads(int total_threads, isc_socketmgr_t *manager) { ISC_MSG_FAILED, "Can't create IOCP thread: %s"), strbuf); - exit(1); } } } @@ -526,7 +523,6 @@ iocompletionport_init(isc_socketmgr_t *manager) { "HeapCreate() failed during " "initialization: %s"), strbuf); - exit(1); } manager->maxIOCPThreads = min(isc_os_ncpus() + 1, MAX_IOCPTHREADS); @@ -544,7 +540,6 @@ iocompletionport_init(isc_socketmgr_t *manager) { "CreateIoCompletionPort() failed " "during initialization: %s"), strbuf); - exit(1); } /* @@ -589,7 +584,6 @@ iocompletionport_update(isc_socket_t *sock) { "CreateIoCompletionPort() failed " "during initialization: %s"), strbuf); - exit(1); } InterlockedIncrement(&sock->manager->iocp_total); @@ -641,7 +635,6 @@ initialise(void) { isc_msgcat_get(isc_msgcat, ISC_MSGSET_GENERAL, ISC_MSG_FAILED, "failed"), strbuf); - exit(1); } /* * The following APIs do not exist as functions in a library, but