pullup:

 318.   [func]          dns_c_ndcctx_destroy() could never return anything
                        except ISC_R_SUCCESS; made it have void return instead.
(More importantly, this change also adds a missing NULL initialization)

diff --git a/CHANGES b/CHANGES
index f820c7bff50c81c305fef5540c298a8579087ed6..8707e18b4592f563b81fbeb9f13e146a82a7410c 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -33,6 +33,9 @@
  319.  [func]          The named.conf "controls" statement is now used
                        to configure the OMAPI command channel.
 
+ 318.  [func]          dns_c_ndcctx_destroy() could never return anything
+                       except ISC_R_SUCCESS; made it have void return instead.
+
  317.  [func]          Use callbacks from libomapi to determine if a
                        new connection is valid, and if a key requested
                        to be used with that connection is valid.

diff --git a/lib/dns/config/confndc.c b/lib/dns/config/confndc.c
index 7591deac6fe40eec12f92f7018d93ea1698718dd..e03900199f72477af6e7d263e26a3f065ca17849 100644 (file)
--- a/lib/dns/config/confndc.c
+++ b/lib/dns/config/confndc.c
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
-/* $Id: confndc.c,v 1.18 2000/06/19 17:41:42 bwelling Exp $ */
+/* $Id: confndc.c,v 1.18.2.1 2000/07/11 19:35:12 gson Exp $ */
 
 /*
 **     options {
@@ -53,7 +53,9 @@
 #include <dns/confndc.h>
 #include <dns/log.h>
  
-/* Type keys for symtab lookup */
+/*
+ * Type keys for symtab lookup.
+ */
 #define KEYWORD_SYM_TYPE 0x1
 #define CLASS_SYM_TYPE 0x2
 #define ACL_SYM_TYPE 0x3
@@ -214,7 +216,7 @@ dns_c_ndcctx_new(isc_mem_t *mem, dns_c_ndcctx_t **ctx) {
        return (ISC_R_SUCCESS);
 }
 
-isc_result_t
+void
 dns_c_ndcctx_destroy(dns_c_ndcctx_t **ndcctx) {
        dns_c_ndcctx_t *ctx;
        isc_mem_t *mem;
@@ -241,8 +243,6 @@ dns_c_ndcctx_destroy(dns_c_ndcctx_t **ndcctx) {
        isc_mem_put(mem, ctx, sizeof *ctx);
 
        *ndcctx = NULL;
-
-       return (ISC_R_SUCCESS);
 }
 
 
@@ -802,7 +802,7 @@ dns_c_ndcparseconf(const char *filename, isc_mem_t *mem,
 {
        ndcpcontext pctx;
        isc_result_t result;
-       dns_c_ndcctx_t *aConfig;
+       dns_c_ndcctx_t *aConfig = NULL;
        
        result = parser_setup(&pctx, mem, filename);
        if (result != ISC_R_SUCCESS)

diff --git a/lib/dns/include/dns/confndc.h b/lib/dns/include/dns/confndc.h
index a25f2477fe99933797da2d4fdc37f78b190b937f..f3e2734bddebb71b038c7ee9a9b057c80c4904f7 100644 (file)
--- a/lib/dns/include/dns/confndc.h
+++ b/lib/dns/include/dns/confndc.h
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
-/* $Id: confndc.h,v 1.8 2000/06/22 21:55:26 tale Exp $ */
+/* $Id: confndc.h,v 1.8.2.1 2000/07/11 19:35:13 gson Exp $ */
 
 #ifndef DNS_CONFNDC_H
 #define DNS_CONFNDC_H 1
@@ -93,7 +93,7 @@ ISC_LANG_BEGINDECLS
 isc_result_t
 dns_c_ndcctx_new(isc_mem_t *mem, dns_c_ndcctx_t **ctx);
 
-isc_result_t
+void
 dns_c_ndcctx_destroy(dns_c_ndcctx_t **ctx);
 
 isc_result_t