rename struct members to avoid a name collision on BSD

diff --git a/lib/isc/include/isc/quota.h b/lib/isc/include/isc/quota.h
index 4addbb8b2383cc3ec5b141eb78d72d1cecd7ab9f..8e593ffb0eefd9a817681b430d1608650e3619cc 100644 (file)
--- a/lib/isc/include/isc/quota.h
+++ b/lib/isc/include/isc/quota.h
@@ -43,9 +43,9 @@ ISC_LANG_BEGINDECLS
 
 /*% isc_quota structure */
 struct isc_quota {
-       atomic_uint_fast32_t            __max;
-       atomic_uint_fast32_t            __used;
-       atomic_uint_fast32_t            __soft;
+       atomic_uint_fast32_t            max;
+       atomic_uint_fast32_t            used;
+       atomic_uint_fast32_t            soft;
 };
 
 

diff --git a/lib/isc/quota.c b/lib/isc/quota.c
index edc9899ecb362172b0b245b297933e17390d27aa..1e25b402d493f1a6dac1d7f6d91f813598365daa 100644 (file)
--- a/lib/isc/quota.c
+++ b/lib/isc/quota.c
@@ -23,50 +23,50 @@
 
 void
 isc_quota_init(isc_quota_t *quota, unsigned int max) {
-       atomic_store(&quota->__max, max);
-       atomic_store(&quota->__used, 0);
-       atomic_store(&quota->__soft, 0);
+       atomic_store(&quota->max, max);
+       atomic_store(&quota->used, 0);
+       atomic_store(&quota->soft, 0);
 }
 
 void
 isc_quota_destroy(isc_quota_t *quota) {
-       INSIST(atomic_load(&quota->__used) == 0);
-       atomic_store(&quota->__max, 0);
-       atomic_store(&quota->__used, 0);
-       atomic_store(&quota->__soft, 0);
+       INSIST(atomic_load(&quota->used) == 0);
+       atomic_store(&quota->max, 0);
+       atomic_store(&quota->used, 0);
+       atomic_store(&quota->soft, 0);
 }
 
 void
 isc_quota_soft(isc_quota_t *quota, unsigned int soft) {
-       atomic_store(&quota->__soft, soft);
+       atomic_store(&quota->soft, soft);
 }
 
 void
 isc_quota_max(isc_quota_t *quota, unsigned int max) {
-       atomic_store(&quota->__max, max);
+       atomic_store(&quota->max, max);
 }
 
 unsigned int
 isc_quota_getmax(isc_quota_t *quota) {
-       return (atomic_load_relaxed(&quota->__max));
+       return (atomic_load_relaxed(&quota->max));
 }
 
 unsigned int
 isc_quota_getsoft(isc_quota_t *quota) {
-       return (atomic_load_relaxed(&quota->__soft));
+       return (atomic_load_relaxed(&quota->soft));
 }
 
 unsigned int
 isc_quota_getused(isc_quota_t *quota) {
-       return (atomic_load_relaxed(&quota->__used));
+       return (atomic_load_relaxed(&quota->used));
 }
 
 isc_result_t
 isc_quota_reserve(isc_quota_t *quota) {
        isc_result_t result;
-       uint32_t max = atomic_load(&quota->__max);
-       uint32_t soft = atomic_load(&quota->__soft);
-       uint32_t used = atomic_fetch_add(&quota->__used, 1);
+       uint32_t max = atomic_load(&quota->max);
+       uint32_t soft = atomic_load(&quota->soft);
+       uint32_t used = atomic_fetch_add(&quota->used, 1);
        if (max == 0 || used < max) {
                if (soft == 0 || used < soft) {
                        result = ISC_R_SUCCESS;
@@ -74,7 +74,7 @@ isc_quota_reserve(isc_quota_t *quota) {
                        result = ISC_R_SOFTQUOTA;
                }
        } else {
-               INSIST(atomic_fetch_sub(&quota->__used, 1) > 0);
+               INSIST(atomic_fetch_sub(&quota->used, 1) > 0);
                result = ISC_R_QUOTA;
        }
        return (result);
@@ -82,7 +82,7 @@ isc_quota_reserve(isc_quota_t *quota) {
 
 void
 isc_quota_release(isc_quota_t *quota) {
-       INSIST(atomic_fetch_sub(&quota->__used, 1) > 0);
+       INSIST(atomic_fetch_sub(&quota->used, 1) > 0);
 }
 
 isc_result_t