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

address or suppress cppcheck warnings

Browse Source
This commit is contained in:
Mark Andrews
2019-08-08 13:52:44 +10:00
parent 30b6e93a70
commit b59fe46e76
52 changed files with 328 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
lib/ns/client.c
View File

@@ -543,11 +543,10 @@ exit_check(ns_client_t *client) {
if (client->nreads > 0) {
dns_tcpmsg_cancelread(&client->tcpmsg);
}
/* Still waiting for read cancel completion. */
if (client->nreads > 0) {
return (true);
/* Still waiting for read cancel completion? */
if (client->nreads > 0) {
return (true);
}
}
if (client->tcpmsg_valid) {
@@ -638,22 +637,20 @@ exit_check(ns_client_t *client) {
if (client->naccepts > 0) {
isc_socket_cancel(client->tcplistener, client->task,
ISC_SOCKCANCEL_ACCEPT);
}
/* Still waiting for accept cancel completion. */
if (client->naccepts > 0) {
return (true);
/* Still waiting for accept cancel completion? */
if (client->naccepts > 0) {
return (true);
}
}
/* Accept cancel is complete. */
if (client->nrecvs > 0) {
isc_socket_cancel(client->udpsocket, client->task,
ISC_SOCKCANCEL_RECV);
}
/* Still waiting for recv cancel completion. */
if (client->nrecvs > 0) {
return (true);
/* Still waiting for recv cancel completion? */
if (client->nrecvs > 0) {
return (true);
}
}
/* Still waiting for control event to be delivered */
@@ -1071,7 +1068,6 @@ client_sendpkg(ns_client_t *client, isc_buffer_t *buffer) {
isc_netaddr_t netaddr;
int match;
unsigned int sockflags = ISC_SOCKFLAG_IMMEDIATE;
isc_dscp_t dispdscp = -1;
if (TCP_CLIENT(client)) {
sock = client->tcpsocket;
@@ -1101,9 +1097,10 @@ client_sendpkg(ns_client_t *client, isc_buffer_t *buffer) {
pktinfo = NULL;
if (client->dispatch != NULL) {
dispdscp = dns_dispatch_getdscp(client->dispatch);
if (dispdscp != -1)
client->dscp = dispdscp;
isc_dscp_t dscp = dns_dispatch_getdscp(client->dispatch);
if (dscp != -1) {
client->dscp = dscp;
}
}
if (client->dscp == -1) {
@@ -3792,7 +3789,7 @@ get_client(ns_clientmgr_t *manager, ns_interface_t *ifp,
ev = &client->ctlevent;
isc_task_send(client->task, &ev);
return (ISC_R_SUCCESS);
return (result);
}
static isc_result_t
@@ -3865,7 +3862,7 @@ get_worker(ns_clientmgr_t *manager, ns_interface_t *ifp, isc_socket_t *sock,
ev = &client->ctlevent;
isc_task_send(client->task, &ev);
return (ISC_R_SUCCESS);
return (result);
}
isc_result_t
@@ -3914,7 +3911,7 @@ ns__clientmgr_getclient(ns_clientmgr_t *manager, ns_interface_t *ifp,
*clientp = client;
return (ISC_R_SUCCESS);
return (result);
}
isc_result_t
@@ -4031,6 +4028,8 @@ ns_client_logv(ns_client_t *client, isc_logcategory_t *category,
const char *signer = "", *qname = "";
dns_name_t *q = NULL;
REQUIRE(client != NULL);
vsnprintf(msgbuf, sizeof(msgbuf), fmt, ap);
if (client->signer != NULL) {