isc_quota_init now returns 'void'

diff --git a/lib/isc/include/isc/quota.h b/lib/isc/include/isc/quota.h
index b9bf59877aca0264d78780b1af17283e71791a97..e61e0e88343d0148be9474b65efa9110eff7abb6 100644 (file)
--- a/lib/isc/include/isc/quota.h
+++ b/lib/isc/include/isc/quota.h
@@ -48,14 +48,10 @@ struct isc_quota {
        int             soft;
 };
 
-isc_result_t
+void
 isc_quota_init(isc_quota_t *quota, int max);
 /*%<
  * Initialize a quota object.
- *
- * Returns:
- *     ISC_R_SUCCESS
- *     Other error     Lock creation failed.
  */
 
 void

diff --git a/lib/isc/quota.c b/lib/isc/quota.c
index 1f4c5fb51f8cf9be9550d81374ce852cae42b9de..c7ab96ede98f3eeb777aea8d9e5290b38d666683 100644 (file)
--- a/lib/isc/quota.c
+++ b/lib/isc/quota.c
@@ -19,14 +19,12 @@
 #include <isc/quota.h>
 #include <isc/util.h>
 
-isc_result_t
+void
 isc_quota_init(isc_quota_t *quota, int max) {
        quota->max = max;
        quota->used = 0;
        quota->soft = 0;
        isc_mutex_init(&quota->lock);
-       /* XXXOND: Todo make return void */
-       return (ISC_R_SUCCESS);
 }
 
 void

diff --git a/lib/ns/server.c b/lib/ns/server.c
index ad7f3815a4644b72cac090c18d89354edbaecfdb..828ce344e8ab0aabd05b322818f35246623eac1e 100644 (file)
--- a/lib/ns/server.c
+++ b/lib/ns/server.c
@@ -52,9 +52,9 @@ ns_server_create(isc_mem_t *mctx, ns_matchview_t matchingview,
 
        isc_refcount_init(&sctx->references, 1);
 
-       CHECKFATAL(isc_quota_init(&sctx->xfroutquota, 10));
-       CHECKFATAL(isc_quota_init(&sctx->tcpquota, 10));
-       CHECKFATAL(isc_quota_init(&sctx->recursionquota, 100));
+       isc_quota_init(&sctx->xfroutquota, 10);
+       isc_quota_init(&sctx->tcpquota, 10);
+       isc_quota_init(&sctx->recursionquota, 100);
 
        CHECKFATAL(dns_tkeyctx_create(mctx, &sctx->tkeyctx));