From: Ondřej Surý <ondrej@sury.org>
Date: Fri, 16 Nov 2018 14:45:01 +0000 (+0100)
Subject: isc_quota_init now returns 'void'
X-Git-Tag: v9.13.5~43^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d940e952063421f79fb4a1ee1909581a8bb2069d;p=thirdparty%2Fbind9.git

isc_quota_init now returns 'void'
---

diff --git a/lib/isc/include/isc/quota.h b/lib/isc/include/isc/quota.h
index b9bf59877ac..e61e0e88343 100644
--- 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 1f4c5fb51f8..c7ab96ede98 100644
--- 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 ad7f3815a46..828ce344e8a 100644
--- 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));