New upstream version 1.18.0 upstream/1.18.0

2 files changed, 3 insertions, 0 deletions

diff --git a/shared/n-acd/src/n-acd-probe.c b/shared/n-acd/src/n-acd-probe.c
index 8c233b56..d4da0fd5 100644
--- a/shared/n-acd/src/n-acd-probe.c
+++ b/shared/n-acd/src/n-acd-probe.c
@@ -215,6 +215,7 @@ static void n_acd_probe_unlink(NAcdProbe *probe) {
         if (n_acd_probe_is_unique(probe)) {
                 r = n_acd_bpf_map_remove(probe->acd->fd_bpf_map, &probe->ip);
                 assert(r >= 0);
+                (void)r;
                 --probe->acd->n_bpf_map;
         }
         c_rbnode_unlink(&probe->ip_node);
diff --git a/shared/n-acd/src/util/timer.c b/shared/n-acd/src/util/timer.c
index 29627af7..07dbf34e 100644
--- a/shared/n-acd/src/util/timer.c
+++ b/shared/n-acd/src/util/timer.c
@@ -44,6 +44,7 @@ void timer_now(Timer *timer, uint64_t *nowp) {
 
         r = clock_gettime(timer->clock, &ts);
         assert(r >= 0);
+        (void)r;
 
         *nowp = ts.tv_sec * UINT64_C(1000000000) + ts.tv_nsec;
 }
@@ -74,6 +75,7 @@ void timer_rearm(Timer *timer) {
                                     },
                                     NULL);
                 assert(r >= 0);
+                (void)r;
 
                 timer->scheduled_timeout = time;
         }