further cleanup

- removed some dead code
- dns_zone_setdbtype is now void as it could no longer return
  anything but ISC_R_SUCCESS; calls to it no longer check for a result
- controlkeylist_fromconfig() is also now void
- fixed a whitespace error

diff --git a/bin/check/check-tool.c b/bin/check/check-tool.c
index 4c89a7b60a1683420ac8be92db81a783c78db95d..c88adb85508742bf5b1437a3e15e7e65f70bc11a 100644 (file)
--- a/bin/check/check-tool.c
+++ b/bin/check/check-tool.c
@@ -664,7 +664,7 @@ load_zone(isc_mem_t *mctx, const char *zonename, const char *filename,
        origin = dns_fixedname_initname(&fixorigin);
        CHECK(dns_name_fromtext(origin, &buffer, dns_rootname, 0, NULL));
        CHECK(dns_zone_setorigin(zone, origin));
-       CHECK(dns_zone_setdbtype(zone, 1, (const char * const *) dbtype));
+       dns_zone_setdbtype(zone, 1, (const char * const *) dbtype);
        CHECK(dns_zone_setfile(zone, filename, fileformat,
                               &dns_master_style_default));
        if (journal != NULL)

diff --git a/bin/named/controlconf.c b/bin/named/controlconf.c
index efb34e52061b797ae13d9d1aeadc91a94f0c0b95..1560879bf3bd48fe2de0680748b06426d233595f 100644 (file)
--- a/bin/named/controlconf.c
+++ b/bin/named/controlconf.c
@@ -706,7 +706,7 @@ cfgkeylist_find(const cfg_obj_t *keylist, const char *keyname,
        return (ISC_R_SUCCESS);
 }
 
-static isc_result_t
+static void
 controlkeylist_fromcfg(const cfg_obj_t *keylist, isc_mem_t *mctx,
                       controlkeylist_t *keyids)
 {
@@ -732,7 +732,6 @@ controlkeylist_fromcfg(const cfg_obj_t *keylist, isc_mem_t *mctx,
                ISC_LIST_APPEND(*keyids, key, link);
                newstr = NULL;
        }
-       return (ISC_R_SUCCESS);
 }
 
 static void
@@ -986,14 +985,11 @@ update_listener(named_controls_t *cp, controllistener_t **listenerp,
                INSIST(global_keylist != NULL);
 
                ISC_LIST_INIT(keys);
-               result = controlkeylist_fromcfg(control_keylist,
-                                               listener->mctx, &keys);
-               if (result == ISC_R_SUCCESS) {
-                       free_controlkeylist(&listener->keys, listener->mctx);
-                       listener->keys = keys;
-                       register_keys(control, global_keylist, &listener->keys,
-                                     listener->mctx, socktext);
-               }
+               controlkeylist_fromcfg(control_keylist, listener->mctx, &keys);
+               free_controlkeylist(&listener->keys, listener->mctx);
+               listener->keys = keys;
+               register_keys(control, global_keylist, &listener->keys,
+                             listener->mctx, socktext);
        } else {
                free_controlkeylist(&listener->keys, listener->mctx);
                result = get_rndckey(listener->mctx, &listener->keys);
@@ -1144,15 +1140,13 @@ add_listener(named_controls_t *cp, controllistener_t **listenerp,
                                     &control_keylist);
 
                if (control_keylist != NULL) {
-                       result = controlkeylist_fromcfg(control_keylist,
-                                                       listener->mctx,
+                       controlkeylist_fromcfg(control_keylist, listener->mctx,
                                                        &listener->keys);
-                       if (result == ISC_R_SUCCESS)
-                               register_keys(control, global_keylist,
-                                             &listener->keys,
-                                             listener->mctx, socktext);
-               } else
+                       register_keys(control, global_keylist, &listener->keys,
+                                     listener->mctx, socktext);
+               } else {
                        result = get_rndckey(mctx, &listener->keys);
+               }
 
                if (result != ISC_R_SUCCESS && control != NULL)
                        cfg_obj_log(control, named_g_lctx, ISC_LOG_WARNING,

diff --git a/bin/named/server.c b/bin/named/server.c
index b21325fb9793903a7344140863c3d4babf685092..ea187d50ad5a6ff3d691de357969bf4b61eacebe 100644 (file)
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -1904,7 +1904,7 @@ dns64_reverse(dns_view_t *view, isc_mem_t *mctx, isc_netaddr_t *na,
        dns_zone_setclass(zone, view->rdclass);
        dns_zone_settype(zone, dns_zone_master);
        dns_zone_setstats(zone, named_g_server->zonestats);
-       CHECK(dns_zone_setdbtype(zone, dns64_dbtypec, dns64_dbtype));
+       dns_zone_setdbtype(zone, dns64_dbtypec, dns64_dbtype);
        if (view->queryacl != NULL)
                dns_zone_setqueryacl(zone, view->queryacl);
        if (view->queryonacl != NULL)
@@ -3410,9 +3410,9 @@ create_empty_zone(dns_zone_t *zone, dns_name_t *name, dns_view_t *view,
                zone = myzone;
                CHECK(dns_zone_setorigin(zone, name));
                CHECK(dns_zonemgr_managezone(named_g_server->zonemgr, zone));
-               if (db == NULL)
-                       CHECK(dns_zone_setdbtype(zone, empty_dbtypec,
-                                                empty_dbtype));
+               if (db == NULL) {
+                       dns_zone_setdbtype(zone, empty_dbtypec, empty_dbtype);
+               }
                dns_zone_setclass(zone, view->rdclass);
                dns_zone_settype(zone, dns_zone_master);
                dns_zone_setstats(zone, named_g_server->zonestats);

diff --git a/bin/named/zoneconf.c b/bin/named/zoneconf.c
index 07dffc77b1b6de2bf7fd773b05cd51a4e6823187..a1abd359a93bdbd5dbb2ae87edfd8df0e5de79b8 100644 (file)
--- a/bin/named/zoneconf.c
+++ b/bin/named/zoneconf.c
@@ -977,12 +977,11 @@ named_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig,
         * cannot be promoted automatically to (const char * const *) by the
         * compiler w/o generating a warning.
         */
-       result = dns_zone_setdbtype(zone, dbargc, (const char * const *)dbargv);
+       dns_zone_setdbtype(zone, dbargc, (const char * const *)dbargv);
        isc_mem_put(mctx, dbargv, dbargc * sizeof(*dbargv));
-       if (cpval != default_dbtype && cpval != dlz_dbtype)
+       if (cpval != default_dbtype && cpval != dlz_dbtype) {
                isc_mem_free(mctx, cpval);
-       if (result != ISC_R_SUCCESS)
-               return (result);
+       }
 
        obj = NULL;
        result = cfg_map_get(zoptions, "file", &obj);

diff --git a/bin/tests/optional/zone_test.c b/bin/tests/optional/zone_test.c
index 7bbc3a9c31ad55dd20eb185c00cafd0d4233bc00..e9b07d9bc7b4f70b1a2c5ff2aaeda168c849c4ab 100644 (file)
--- a/bin/tests/optional/zone_test.c
+++ b/bin/tests/optional/zone_test.c
@@ -99,8 +99,7 @@ setup(const char *zonename, const char *filename, const char *classname) {
        result = dns_zone_setorigin(zone, origin);
        ERRRET(result, "dns_zone_setorigin");
 
-       result = dns_zone_setdbtype(zone, 1, &rbt);
-       ERRRET(result, "dns_zone_setdatabase");
+       dns_zone_setdbtype(zone, 1, &rbt);
 
        result = dns_zone_setfile(zone, filename, dns_masterformat_text,
                                  &dns_master_style_default);

diff --git a/bin/tests/system/dyndb/driver/zone.c b/bin/tests/system/dyndb/driver/zone.c
index 683c8ca7a76954a7d69689e73ec247e8c8d2f1c2..07c56cb298cee0c01c1ee1bfb197eac3e4a1c2b4 100644 (file)
--- a/bin/tests/system/dyndb/driver/zone.c
+++ b/bin/tests/system/dyndb/driver/zone.c
@@ -57,13 +57,8 @@ create_zone(sample_instance_t * const inst, dns_name_t * const name,
        }
        dns_zone_setclass(raw, dns_rdataclass_in);
        dns_zone_settype(raw, dns_zone_master);
-       result = dns_zone_setdbtype(raw, 1, zone_argv);
-       if (result != ISC_R_SUCCESS) {
-               log_write(ISC_LOG_ERROR,
-                         "create_zone: dns_zone_setdbtype -> %s\n",
-                         isc_result_totext(result));
-               goto cleanup;
-       }
+       dns_zone_setdbtype(raw, 1, zone_argv);
+
        result = dns_zonemgr_managezone(inst->zmgr, raw);
        if (result != ISC_R_SUCCESS) {
                log_write(ISC_LOG_ERROR,

diff --git a/contrib/dlz/drivers/dlz_filesystem_driver.c b/contrib/dlz/drivers/dlz_filesystem_driver.c
index fb6c1a75b55bbcec92a3919bb68dde0527839cd1..dbe15291d532555dd740d5475063cb142ddad7c5 100644 (file)
--- a/contrib/dlz/drivers/dlz_filesystem_driver.c
+++ b/contrib/dlz/drivers/dlz_filesystem_driver.c
@@ -925,19 +925,6 @@ fs_create(const char *dlzname, unsigned int argc, char *argv[],
 
        /* return success */
        return (ISC_R_SUCCESS);
-
-       /* if we allocated a config data object clean it up */
-       if (cd != NULL)
-               fs_destroy(NULL, cd);
-
-       /* write error message */
-       isc_log_write(dns_lctx, DNS_LOGCATEGORY_DATABASE,
-                     DNS_LOGMODULE_DLZ, ISC_LOG_ERROR,
-                     "Filesystem driver unable to "
-                     "allocate memory for config data.");
-
-       /* return error */
-       return (ISC_R_NOMEMORY);
 }
 
 static void

diff --git a/lib/dns/include/dns/zone.h b/lib/dns/include/dns/zone.h
index 33c1131f7fac9fb4e45d0315905b6f122cef9d50..ccbc8a6d8e3bd79c0f7ad18b17745f0880f939de 100644 (file)
--- a/lib/dns/include/dns/zone.h
+++ b/lib/dns/include/dns/zone.h
@@ -483,7 +483,7 @@ dns_zone_setdb(dns_zone_t *zone, dns_db_t *db);
  *\li  zone doesn't have a database.
  */
 
-isc_result_t
+void
 dns_zone_setdbtype(dns_zone_t *zone,
                   unsigned int dbargc, const char * const *dbargv);
 /*%<
@@ -496,10 +496,6 @@ dns_zone_setdbtype(dns_zone_t *zone,
  *\li  'database' to be non NULL.
  *\li  'dbargc' to be >= 1
  *\li  'dbargv' to point to dbargc NULL-terminated strings
- *
- * Returns:
- *\li  #ISC_R_NOMEMORY
- *\li  #ISC_R_SUCCESS
  */
 
 isc_result_t

diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index e808ef076b697f58bcaa7cbeda2d1956af35589c..25e93d10473a8cc6073606926695d61a3c8bf3cf 100644 (file)
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -1067,10 +1067,7 @@ dns_zone_create(dns_zone_t **zonep, isc_mem_t *mctx) {
        }
 
        /* Must be after magic is set. */
-       result = dns_zone_setdbtype(zone, dbargc_default, dbargv_default);
-       if (result != ISC_R_SUCCESS) {
-               goto free_stats;
-       }
+       dns_zone_setdbtype(zone, dbargc_default, dbargv_default);
 
        ISC_EVENT_INIT(&zone->ctlevent, sizeof(zone->ctlevent), 0, NULL,
                       DNS_EVENT_ZONECONTROL, zone_shutdown, zone, zone,
@@ -1078,10 +1075,6 @@ dns_zone_create(dns_zone_t **zonep, isc_mem_t *mctx) {
        *zonep = zone;
        return (ISC_R_SUCCESS);
 
- free_stats:
-       if (zone->gluecachestats != NULL)
-               isc_stats_detach(&zone->gluecachestats);
-
  free_erefs:
        INSIST(isc_refcount_decrement(&zone->erefs) > 0);
        isc_refcount_destroy(&zone->erefs);
@@ -1438,11 +1431,10 @@ dns_zone_getdbtype(dns_zone_t *zone, char ***argv, isc_mem_t *mctx) {
        return (result);
 }
 
-isc_result_t
+void
 dns_zone_setdbtype(dns_zone_t *zone,
                   unsigned int dbargc, const char * const *dbargv)
 {
-       isc_result_t result = ISC_R_SUCCESS;
        char **argv = NULL;
        unsigned int i;
 
@@ -1466,11 +1458,8 @@ dns_zone_setdbtype(dns_zone_t *zone,
 
        zone->db_argc = dbargc;
        zone->db_argv = argv;
-       result = ISC_R_SUCCESS;
 
        UNLOCK_ZONE(zone);
-
-       return (result);
 }
 
 static void

diff --git a/lib/isc/mem.c b/lib/isc/mem.c
index 5199a61affc4be67626aa785b1529093f127e773..fcfce2350382a50c1e01d6ef0911261f61926afe 100644 (file)
--- a/lib/isc/mem.c
+++ b/lib/isc/mem.c
@@ -385,7 +385,7 @@ more_basic_blocks(isc__mem_t *ctx) {
        ctx->basic_table_count++;
        ctx->malloced += NUM_BASIC_BLOCKS * ctx->mem_target;
        if (ctx->malloced > ctx->maxmalloced) {
-                       ctx->maxmalloced = ctx->malloced;
+               ctx->maxmalloced = ctx->malloced;
        }
 
        curr = tmp;