Address cppcheck reports

(cherry picked from commit fcebc4f15b95f48b2d1430b9d31805c4b287b825)

diff --git a/lib/dns/masterdump.c b/lib/dns/masterdump.c
index 7edef6ad9b645f231c691644fad140a08dab5675..13d1a3e03a72852b2760d001f1e301be5490d504 100644 (file)
--- a/lib/dns/masterdump.c
+++ b/lib/dns/masterdump.c
@@ -327,17 +327,15 @@ totext_ctx_init(const dns_master_style_t *style, dns_totext_ctx_t *ctx) {
         */
        if ((ctx->style.flags & DNS_STYLEFLAG_MULTILINE) != 0) {
                isc_buffer_t buf;
-               isc_region_t r;
                unsigned int col = 0;
 
                isc_buffer_init(&buf, ctx->linebreak_buf,
                                sizeof(ctx->linebreak_buf));
 
-               isc_buffer_availableregion(&buf, &r);
-               if (r.length < 1)
+               if (isc_buffer_availablelength(&buf) < 1) {
                        return (DNS_R_TEXTTOOLONG);
-               r.base[0] = '\n';
-               isc_buffer_add(&buf, 1);
+               }
+               isc_buffer_putuint8(&buf, '\n');
 
                if ((ctx->style.flags & DNS_STYLEFLAG_INDENT) != 0 ||
                    (ctx->style.flags & DNS_STYLEFLAG_YAML) != 0)
@@ -351,11 +349,10 @@ totext_ctx_init(const dns_master_style_t *style, dns_totext_ctx_t *ctx) {
                }
 
                if ((ctx->style.flags & DNS_STYLEFLAG_COMMENTDATA) != 0) {
-                       isc_buffer_availableregion(&buf, &r);
-                       if (r.length < 1)
+                       if (isc_buffer_availablelength(&buf) < 1) {
                                return (DNS_R_TEXTTOOLONG);
-                       r.base[0] = ';';
-                       isc_buffer_add(&buf, 1);
+                       }
+                       isc_buffer_putuint8(&buf, ';');
                }
 
                result = indent(&col, ctx->style.rdata_column,
@@ -372,11 +369,10 @@ totext_ctx_init(const dns_master_style_t *style, dns_totext_ctx_t *ctx) {
                if (result != ISC_R_SUCCESS)
                        return (result);
 
-               isc_buffer_availableregion(&buf, &r);
-               if (r.length < 1)
+               if (isc_buffer_availablelength(&buf) < 1) {
                        return (DNS_R_TEXTTOOLONG);
-               r.base[0] = '\0';
-               isc_buffer_add(&buf, 1);
+               }
+               isc_buffer_putuint8(&buf, '\0');
                ctx->linebreak = ctx->linebreak_buf;
        } else {
                ctx->linebreak = NULL;
@@ -665,7 +661,6 @@ rdataset_totext(dns_rdataset_t *rdataset,
                        break;
                } else {
                        dns_rdata_t rdata = DNS_RDATA_INIT;
-                       isc_region_t r;
 
                        dns_rdataset_current(rdataset, &rdata);
 
@@ -679,11 +674,10 @@ rdataset_totext(dns_rdataset_t *rdataset,
                                                   ctx->linebreak,
                                                   target));
 
-                       isc_buffer_availableregion(target, &r);
-                       if (r.length < 1)
+                       if (isc_buffer_availablelength(target) < 1) {
                                return (ISC_R_NOSPACE);
-                       r.base[0] = '\n';
-                       isc_buffer_add(target, 1);
+                       }
+                       isc_buffer_putuint8(target, '\n');
                }
 
                first = false;
@@ -721,7 +715,6 @@ question_totext(dns_rdataset_t *rdataset,
 {
        unsigned int column;
        isc_result_t result;
-       isc_region_t r;
 
        REQUIRE(DNS_RDATASET_VALID(rdataset));
        result = dns_rdataset_first(rdataset);
@@ -770,11 +763,10 @@ question_totext(dns_rdataset_t *rdataset,
                column += (target->used - type_start);
        }
 
-       isc_buffer_availableregion(target, &r);
-       if (r.length < 1)
+       if (isc_buffer_availablelength(target) < 1) {
                return (ISC_R_NOSPACE);
-       r.base[0] = '\n';
-       isc_buffer_add(target, 1);
+       }
+       isc_buffer_putuint8(target, '\n');
 
        return (ISC_R_SUCCESS);
 }

diff --git a/lib/isc/win32/app.c b/lib/isc/win32/app.c
index 35274a271510570eb77d583f6f80ca1091be5e87..8b8a7b1550815f63a2dd1571f6820f2adfb13e59 100644 (file)
--- a/lib/isc/win32/app.c
+++ b/lib/isc/win32/app.c
@@ -86,10 +86,10 @@ enum {
 };
 
 typedef struct isc__appctx {
-       isc_appctx_t            common;
-       isc_mem_t               *mctx;
-       isc_eventlist_t         on_run;
-       isc_mutex_t             lock;
+       isc_appctx_t    common;
+       isc_mem_t       *mctx;
+       isc_eventlist_t on_run;
+       isc_mutex_t     lock;
        bool            shutdown_requested;
        bool            running;
        /*
@@ -103,11 +103,11 @@ typedef struct isc__appctx {
 
        bool            blocked;
 
-       HANDLE                  hEvents[NUM_EVENTS];
+       HANDLE          hEvents[NUM_EVENTS];
 
-       isc_taskmgr_t           *taskmgr;
-       isc_socketmgr_t         *socketmgr;
-       isc_timermgr_t          *timermgr;
+       isc_taskmgr_t   *taskmgr;
+       isc_socketmgr_t *socketmgr;
+       isc_timermgr_t  *timermgr;
 } isc__appctx_t;
 
 static isc__appctx_t isc_g_appctx;