upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-15 22:38:52 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch '202-cppcheck-reporting-miscellaneous-issues-v9_12' into 'v9_12'

Browse source 
Resolve "cppcheck reporting miscellaneous issues"

See merge request isc-projects/bind9!216
This commit is contained in:
Ondřej Surý 2018-04-20 18:20:11 -04:00
commit 0071c0400f
5 changed files with 4 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
bin/named/win32/ntservice.c
View file

@ -9,8 +9,6 @@
* information regarding copyright ownership.
*/
/* $Id: ntservice.c,v 1.16 2011/01/13 08:50:29 tbox Exp $ */
#include <config.h>
#include <stdio.h>
@ -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 {

2
lib/dns/tests/name_test.c
View file

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

2
lib/isc/tests/task_test.c
View file

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

4
lib/isc/tests/timer_test.c
View file

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

7
lib/isc/win32/socket.c
View file

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