Fix compilation warnings in dlz_wildcard_dynamic.c

    dlz_wildcard_dynamic.c: In function ‘dlz_lookup’:
    dlz_wildcard_dynamic.c:227:14: warning: variable ‘origin’ set but not used [-Wunused-but-set-variable]
      227 |         bool origin = true;
          |              ^~~~~~
    dlz_wildcard_dynamic.c: In function ‘dlz_lookup’:
    dlz_wildcard_dynamic.c:252:28: warning: assignment discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers]
      252 |                 cd->record = "@";
          |                            ^
    dlz_wildcard_dynamic.c: In function ‘dlz_authority’:
    dlz_wildcard_dynamic.c:328:22: warning: unused variable ‘origin’ [-Wunused-variable]
      328 |                 bool origin;
          |                      ^~~~~~
    dlz_wildcard_dynamic.c:312:25: warning: unused variable ‘name’ [-Wunused-variable]
      312 |         const char *p, *name = "@";
          |                         ^~~~
    dlz_wildcard_dynamic.c: In function ‘dlz_create’:
    dlz_wildcard_dynamic.c:441:23: warning: comparison of integer expressions of different signedness: ‘int’ and ‘unsigned int’ [-Wsign-compare]
      441 |         for (i = 4; i < argc; i += 4) {
          |                       ^

(cherry picked from commit 76c8c58d5472d70330187a88e7a7f8b206e3f1e6)

diff --git a/contrib/dlz/modules/wildcard/dlz_wildcard_dynamic.c b/contrib/dlz/modules/wildcard/dlz_wildcard_dynamic.c
index 21a602fd3047459bc6bac0a4df725e9b89886517..95221a1e5ef83f2d7fa2e2d1ed0ba7526108f1a8 100644 (file)
--- a/contrib/dlz/modules/wildcard/dlz_wildcard_dynamic.c
+++ b/contrib/dlz/modules/wildcard/dlz_wildcard_dynamic.c
@@ -224,7 +224,6 @@ dlz_lookup(const char *zone, const char *name, void *dbdata,
        const char *p;
        char *namebuf;
        nrr_t *nrec;
-       bool origin = true;
 
 #if DLZ_DLOPEN_VERSION >= 2
        UNUSED(methods);
@@ -249,9 +248,8 @@ dlz_lookup(const char *zone, const char *name, void *dbdata,
                strncpy(namebuf, zone, len - 1);
                namebuf[len - 1] = '\0';
                cd->record = namebuf;
-               origin = false;
        } else if (p == zone) {
-               cd->record = "@";
+               cd->record = (char *)"@";
        }
 
        /* Write info message to log */
@@ -310,7 +308,7 @@ dlz_authority(const char *zone, void *dbdata, dns_sdlzlookup_t *lookup) {
        config_data_t *cd = (config_data_t *)dbdata;
        char *querystring = NULL;
        nrr_t *nrec;
-       const char *p, *name = "@";
+       const char *p;
 
        p = shortest_match(cd->zone_pattern, zone);
        if (p == NULL) {
@@ -326,7 +324,6 @@ dlz_authority(const char *zone, void *dbdata, dns_sdlzlookup_t *lookup) {
        result = ISC_R_NOTFOUND;
        nrec = DLZ_LIST_HEAD(cd->rrs_list);
        while (nrec != NULL) {
-               bool origin;
                if (strcmp("@", nrec->name) == 0) {
                        isc_result_t presult;
 
@@ -392,7 +389,8 @@ dlz_create(const char *dlzname, unsigned int argc, char *argv[], void **dbdata,
           ...) {
        config_data_t *cd;
        char *endp;
-       int i, def_ttl;
+       unsigned int i;
+       int def_ttl;
        nrr_t *trec = NULL;
        isc_result_t result;
        const char *helper_name;