]> git.ipfire.org Git - thirdparty/bind9.git/commitdiff
formally discard return value
authorMark Andrews <marka@isc.org>
Fri, 6 Dec 2019 22:48:43 +0000 (09:48 +1100)
committerMark Andrews <marka@isc.org>
Mon, 13 Jan 2020 05:07:13 +0000 (05:07 +0000)
lib/dns/tests/dbversion_test.c
lib/isc/rwlock.c
lib/isc/stats.c

index a53249a63959fcb5cb16a2d4c221e54bcba8d3a0..6cdfd93fc18c5d7918a131c9aa684a599088ea82 100644 (file)
@@ -196,9 +196,9 @@ find(void **state) {
        }
 
        dns_rdataset_init(&rdataset);
-       check_assertion(dns_db_find(db1, dns_rootname, v2,
-                                   dns_rdatatype_soa, 0, 0, NULL,
-                                   name, &rdataset, NULL));
+       check_assertion((void)dns_db_find(db1, dns_rootname, v2,
+                                         dns_rdatatype_soa, 0, 0, NULL,
+                                         name, &rdataset, NULL));
 }
 
 /*
index 9533c0f828ffe7c369043314a7d23261472dee75..4306275593364c27a4ada3cda8108bb01153d414 100644 (file)
@@ -486,8 +486,8 @@ isc_rwlock_trylock(isc_rwlock_t *rwl, isc_rwlocktype_t type) {
                 * order.
                 */
 #if defined(ISC_RWLOCK_USESTDATOMIC)
-               atomic_fetch_sub_explicit(&rwl->write_completions, 1,
-                                         memory_order_relaxed);
+               (void)atomic_fetch_sub_explicit(&rwl->write_completions, 1,
+                                               memory_order_relaxed);
 #else
                (void)isc_atomic_xadd(&rwl->write_completions, -1);
 #endif
@@ -527,11 +527,11 @@ isc_rwlock_tryupgrade(isc_rwlock_t *rwl) {
                         * We are the only reader and have been upgraded.
                         * Now jump into the head of the writer waiting queue.
                         */
-                       atomic_fetch_sub_explicit(&rwl->write_completions, 1,
-                                                 memory_order_relaxed);
-               } else
+                       (void)atomic_fetch_sub_explicit(&rwl->write_completions,
+                                                      1, memory_order_relaxed);
+               } else {
                        return (ISC_R_LOCKBUSY);
-
+               }
        }
 #else
        {
@@ -577,10 +577,11 @@ isc_rwlock_downgrade(isc_rwlock_t *rwl) {
                INSIST((prev_readers & WRITER_ACTIVE) != 0);
 
                /* Complete write */
-               atomic_fetch_sub_explicit(&rwl->cnt_and_flag, WRITER_ACTIVE,
-                                         memory_order_relaxed);
-               atomic_fetch_add_explicit(&rwl->write_completions, 1,
-                                         memory_order_relaxed);
+               (void)atomic_fetch_sub_explicit(&rwl->cnt_and_flag,
+                                               WRITER_ACTIVE,
+                                               memory_order_relaxed);
+               (void)atomic_fetch_add_explicit(&rwl->write_completions, 1,
+                                               memory_order_relaxed);
        }
 #else
        {
@@ -640,10 +641,11 @@ isc_rwlock_unlock(isc_rwlock_t *rwl, isc_rwlocktype_t type) {
                 * we are done.
                 */
 #if defined(ISC_RWLOCK_USESTDATOMIC)
-               atomic_fetch_sub_explicit(&rwl->cnt_and_flag, WRITER_ACTIVE,
-                                         memory_order_relaxed);
-               atomic_fetch_add_explicit(&rwl->write_completions, 1,
-                                         memory_order_relaxed);
+               (void)atomic_fetch_sub_explicit(&rwl->cnt_and_flag,
+                                               WRITER_ACTIVE,
+                                               memory_order_relaxed);
+               (void)atomic_fetch_add_explicit(&rwl->write_completions, 1,
+                                               memory_order_relaxed);
 #else
                (void)isc_atomic_xadd(&rwl->cnt_and_flag, -WRITER_ACTIVE);
                (void)isc_atomic_xadd(&rwl->write_completions, 1);
index a7ab97ce53f17a3e129f03c4ac8c99b6a882990b..bb6e0aaa96e9ff328e6730e5acf06bc5e54933ec 100644 (file)
@@ -218,8 +218,8 @@ isc_stats_ncounters(isc_stats_t *stats) {
 static inline void
 incrementcounter(isc_stats_t *stats, int counter) {
 #if ISC_PLATFORM_HAVESTDATOMIC
-       atomic_fetch_add_explicit(&stats->counters[counter], 1,
-                                 memory_order_relaxed);
+       (void)atomic_fetch_add_explicit(&stats->counters[counter], 1,
+                                       memory_order_relaxed);
 #elif ISC_STATS_HAVEATOMICQ
        isc_atomic_xaddq((int64_t *)&stats->counters[counter], 1);
 #elif ISC_STATS_USEMULTIFIELDS
@@ -243,15 +243,16 @@ incrementcounter(isc_stats_t *stats, int counter) {
 static inline void
 decrementcounter(isc_stats_t *stats, int counter) {
 #if ISC_PLATFORM_HAVESTDATOMIC
-       atomic_fetch_sub_explicit(&stats->counters[counter], 1,
-                                 memory_order_relaxed);
+       (void)atomic_fetch_sub_explicit(&stats->counters[counter], 1,
+                                       memory_order_relaxed);
 #elif ISC_STATS_HAVEATOMICQ
-       isc_atomic_xaddq((int64_t *)&stats->counters[counter], -1);
+       (void)isc_atomic_xaddq((int64_t *)&stats->counters[counter], -1);
 #elif ISC_STATS_USEMULTIFIELDS
        int32_t prev =
                isc_atomic_xadd((int32_t *)&stats->counters[counter].lo, -1);
        if (prev == 0) {
-               isc_atomic_xadd((int32_t *)&stats->counters[counter].hi, -1);
+               (void)isc_atomic_xadd((int32_t *)&stats->counters[counter].hi,
+                                     -1);
        }
 #else
        stats->counters[counter]--;