svn commit: r491555 - head/dns/bind9-devel/files
Mathieu Arnold
mat at FreeBSD.org
Tue Jan 29 12:18:26 UTC 2019
Author: mat
Date: Tue Jan 29 12:18:25 2019
New Revision: 491555
URL: https://svnweb.freebsd.org/changeset/ports/491555
Log:
Use official patch instead of my half baked one.
No functionnal changes.
Modified:
head/dns/bind9-devel/files/patch-fix-quota (contents, props changed)
Modified: head/dns/bind9-devel/files/patch-fix-quota
==============================================================================
--- head/dns/bind9-devel/files/patch-fix-quota Tue Jan 29 11:23:39 2019 (r491554)
+++ head/dns/bind9-devel/files/patch-fix-quota Tue Jan 29 12:18:25 2019 (r491555)
@@ -1,50 +1,92 @@
+From 995134ce76e869cbcdc6c838570bd7d2f653dfa9 Mon Sep 17 00:00:00 2001
+From: Evan Hunt <each at isc.org>
+Date: Mon, 28 Jan 2019 10:59:27 -0800
+Subject: [PATCH] rename struct members to avoid a name collision on BSD
+
--- lib/isc/include/isc/quota.h.orig 2019-01-25 09:45:27 UTC
+++ lib/isc/include/isc/quota.h
-@@ -44,7 +44,7 @@ ISC_LANG_BEGINDECLS
+@@ -43,9 +43,9 @@ ISC_LANG_BEGINDECLS
+
/*% isc_quota structure */
struct isc_quota {
- atomic_uint_fast32_t __max;
+- atomic_uint_fast32_t __max;
- atomic_uint_fast32_t __used;
-+ atomic_uint_fast32_t _used;
- atomic_uint_fast32_t __soft;
+- atomic_uint_fast32_t __soft;
++ atomic_uint_fast32_t max;
++ atomic_uint_fast32_t used;
++ atomic_uint_fast32_t soft;
};
+
+ lib/isc/include/isc/quota.h | 6 +++---
+ lib/isc/quota.c | 34 +++++++++++++++++-----------------
+ 2 files changed, 20 insertions(+), 20 deletions(-)
+
--- lib/isc/quota.c.orig 2019-01-25 09:45:27 UTC
+++ lib/isc/quota.c
-@@ -24,15 +24,15 @@
+@@ -23,50 +23,50 @@
+
void
isc_quota_init(isc_quota_t *quota, unsigned int max) {
- atomic_store("a->__max, max);
+- atomic_store("a->__max, max);
- atomic_store("a->__used, 0);
-+ atomic_store("a->_used, 0);
- atomic_store("a->__soft, 0);
+- atomic_store("a->__soft, 0);
++ atomic_store("a->max, max);
++ atomic_store("a->used, 0);
++ atomic_store("a->soft, 0);
}
void
isc_quota_destroy(isc_quota_t *quota) {
- INSIST(atomic_load("a->__used) == 0);
-+ INSIST(atomic_load("a->_used) == 0);
- atomic_store("a->__max, 0);
+- atomic_store("a->__max, 0);
- atomic_store("a->__used, 0);
-+ atomic_store("a->_used, 0);
- atomic_store("a->__soft, 0);
+- atomic_store("a->__soft, 0);
++ INSIST(atomic_load("a->used) == 0);
++ atomic_store("a->max, 0);
++ atomic_store("a->used, 0);
++ atomic_store("a->soft, 0);
}
-@@ -58,7 +58,7 @@ isc_quota_getsoft(isc_quota_t *quota) {
+ void
+ isc_quota_soft(isc_quota_t *quota, unsigned int soft) {
+- atomic_store("a->__soft, soft);
++ atomic_store("a->soft, soft);
+ }
+ void
+ isc_quota_max(isc_quota_t *quota, unsigned int max) {
+- atomic_store("a->__max, max);
++ atomic_store("a->max, max);
+ }
+
unsigned int
+ isc_quota_getmax(isc_quota_t *quota) {
+- return (atomic_load_relaxed("a->__max));
++ return (atomic_load_relaxed("a->max));
+ }
+
+ unsigned int
+ isc_quota_getsoft(isc_quota_t *quota) {
+- return (atomic_load_relaxed("a->__soft));
++ return (atomic_load_relaxed("a->soft));
+ }
+
+ unsigned int
isc_quota_getused(isc_quota_t *quota) {
- return (atomic_load_relaxed("a->__used));
-+ return (atomic_load_relaxed("a->_used));
++ return (atomic_load_relaxed("a->used));
}
isc_result_t
-@@ -66,7 +66,7 @@ isc_quota_reserve(isc_quota_t *quota) {
+ isc_quota_reserve(isc_quota_t *quota) {
isc_result_t result;
- uint32_t max = atomic_load("a->__max);
- uint32_t soft = atomic_load("a->__soft);
+- uint32_t max = atomic_load("a->__max);
+- uint32_t soft = atomic_load("a->__soft);
- uint32_t used = atomic_fetch_add("a->__used, 1);
-+ uint32_t used = atomic_fetch_add("a->_used, 1);
++ uint32_t max = atomic_load("a->max);
++ uint32_t soft = atomic_load("a->soft);
++ uint32_t used = atomic_fetch_add("a->used, 1);
if (max == 0 || used < max) {
if (soft == 0 || used < soft) {
result = ISC_R_SUCCESS;
@@ -53,7 +95,7 @@
}
} else {
- INSIST(atomic_fetch_sub("a->__used, 1) > 0);
-+ INSIST(atomic_fetch_sub("a->_used, 1) > 0);
++ INSIST(atomic_fetch_sub("a->used, 1) > 0);
result = ISC_R_QUOTA;
}
return (result);
@@ -62,7 +104,7 @@
void
isc_quota_release(isc_quota_t *quota) {
- INSIST(atomic_fetch_sub("a->__used, 1) > 0);
-+ INSIST(atomic_fetch_sub("a->_used, 1) > 0);
++ INSIST(atomic_fetch_sub("a->used, 1) > 0);
}
isc_result_t
More information about the svn-ports-all
mailing list