fix cppcheck warnings: unreadVariable

diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index 6550504658ce764cf294bbf4cabc9c273f097925..c9857e753f686762a05f74e2d88700af6465dbbb 100644 (file)
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -2292,7 +2292,7 @@ dns_zone_asyncload2(dns_zone_t *zone, dns_zt_zoneloaded_t done, void * arg,
        isc_task_send(zone->loadtask, &e);
        UNLOCK_ZONE(zone);
 
-       return (ISC_R_SUCCESS);
+       return (result);
 
   failure:
        if (asl != NULL)

diff --git a/lib/isc/mem.c b/lib/isc/mem.c
index 64cbe8cf788ce46c7edaba68c03d88bd1d071d62..d73ebea28635e97ef980d28e76a0ccd4c83fe7cc 100644 (file)
--- a/lib/isc/mem.c
+++ b/lib/isc/mem.c
@@ -2557,7 +2557,7 @@ isc_mem_renderxml(xmlTextWriterPtr writer) {
 
 static isc_result_t
 json_renderctx(isc__mem_t *ctx, summarystat_t *summary, json_object *array) {
-       isc_result_t result = ISC_R_FAILURE;
+       isc_result_t result = ISC_R_SUCCESS;
        json_object *ctxobj, *obj;
        char buf[1024];
 
@@ -2639,7 +2639,7 @@ json_renderctx(isc__mem_t *ctx, summarystat_t *summary, json_object *array) {
 
        MCTXUNLOCK(ctx, &ctx->lock);
        json_object_array_add(array, ctxobj);
-       return (ISC_R_SUCCESS);
+       return (result);
 
  error:
        MCTXUNLOCK(ctx, &ctx->lock);
@@ -2696,7 +2696,7 @@ isc_mem_renderjson(json_object *memobj) {
        json_object_object_add(memobj, "Lost", obj);
 
        json_object_object_add(memobj, "contexts", ctxarray);
-       return (ISC_R_SUCCESS);
+       return (result);
 
  error:
        if (ctxarray != NULL)

diff --git a/lib/isc/pk11.c b/lib/isc/pk11.c
index 0d5b00939e94c64e7345607c37507fbff34ce506..5e8c7ea246cf66f49521b179c04957731229b18b 100644 (file)
--- a/lib/isc/pk11.c
+++ b/lib/isc/pk11.c
@@ -1393,6 +1393,7 @@ pk11_dump_tokens(void) {
                        if (!first)
                                printf(",");
                        first = false;
+                       UNUSED(first);
                        printf("AES");
                }
                printf(")\n");