src/basic/ratelimit.c

@@ -13,7 +13,7 @@ bool ratelimit_below(RateLimit *r) {
 
         assert(r);
 
-        if (!ratelimit_configured(r))
+        if (r->interval <= 0 || r->burst <= 0)
                 return true;
 
         ts = now(CLOCK_MONOTONIC);

src/basic/ratelimit.h

@@ -17,8 +17,4 @@ static inline void ratelimit_reset(RateLimit *rl) {
         rl->num = rl->begin = 0;
 }
 
-static inline bool ratelimit_configured(RateLimit *rl) {
-        return rl->interval > 0 && rl->burst > 0;
-}
-
 bool ratelimit_below(RateLimit *r);

src/libsystemd/sd-event/sd-event.c

@@ -399,11 +399,13 @@ static int source_io_register(
                 .events = events | (enabled == SD_EVENT_ONESHOT ? EPOLLONESHOT : 0),
                 .data.ptr = s,
         };
+        int r;
 
-        if (epoll_ctl(s->event->epoll_fd,
+        r = epoll_ctl(s->event->epoll_fd,
                       s->io.registered ? EPOLL_CTL_MOD : EPOLL_CTL_ADD,
                       s->io.fd,
-                      &ev) < 0)
+                      &ev);
+        if (r < 0)
                 return -errno;
 
         s->io.registered = true;
@@ -614,7 +616,8 @@ static int event_make_signal_data(
                 .data.ptr = d,
         };
 
-        if (epoll_ctl(e->epoll_fd, EPOLL_CTL_ADD, d->fd, &ev) < 0) {
+        r = epoll_ctl(e->epoll_fd, EPOLL_CTL_ADD, d->fd, &ev);
+        if (r < 0)  {
                 r = -errno;
                 goto fail;
         }
@@ -1049,6 +1052,7 @@ static int event_setup_timer_fd(
                 return 0;
 
         _cleanup_close_ int fd = -1;
+        int r;
 
         fd = timerfd_create(clock, TFD_NONBLOCK|TFD_CLOEXEC);
         if (fd < 0)
@@ -1061,7 +1065,8 @@ static int event_setup_timer_fd(
                 .data.ptr = d,
         };
 
-        if (epoll_ctl(e->epoll_fd, EPOLL_CTL_ADD, fd, &ev) < 0)
+        r = epoll_ctl(e->epoll_fd, EPOLL_CTL_ADD, fd, &ev);
+        if (r < 0)
                 return -errno;
 
         d->fd = TAKE_FD(fd);
@@ -2771,6 +2776,7 @@ static int event_arm_timer(
         struct itimerspec its = {};
         sd_event_source *a, *b;
         usec_t t;
+        int r;
 
         assert(e);
         assert(d);
@@ -2790,8 +2796,9 @@ static int event_arm_timer(
                         return 0;
 
                 /* disarm */
-                if (timerfd_settime(d->fd, TFD_TIMER_ABSTIME, &its, NULL) < 0)
+                r = timerfd_settime(d->fd, TFD_TIMER_ABSTIME, &its, NULL);
-                        return -errno;
+                if (r < 0)
+                        return r;
 
                 d->next = USEC_INFINITY;
                 return 0;
@@ -2813,7 +2820,8 @@ static int event_arm_timer(
         } else
                 timespec_store(&its.it_value, t);
 
-        if (timerfd_settime(d->fd, TFD_TIMER_ABSTIME, &its, NULL) < 0)
+        r = timerfd_settime(d->fd, TFD_TIMER_ABSTIME, &its, NULL);
+        if (r < 0)
                 return -errno;
 
         d->next = t;
@@ -2938,8 +2946,9 @@ static int process_child(sd_event *e) {
                         continue;
 
                 zero(s->child.siginfo);
-                if (waitid(P_PID, s->child.pid, &s->child.siginfo,
+                r = waitid(P_PID, s->child.pid, &s->child.siginfo,
-                           WNOHANG | (s->child.options & WEXITED ? WNOWAIT : 0) | s->child.options) < 0)
+                           WNOHANG | (s->child.options & WEXITED ? WNOWAIT : 0) | s->child.options);
+                if (r < 0)
                         return -errno;
 
                 if (s->child.siginfo.si_pid != 0) {
@@ -3430,6 +3439,7 @@ static sd_event_source* event_next_pending(sd_event *e) {
 static int arm_watchdog(sd_event *e) {
         struct itimerspec its = {};
         usec_t t;
+        int r;
 
         assert(e);
         assert(e->watchdog_fd >= 0);
@@ -3445,7 +3455,8 @@ static int arm_watchdog(sd_event *e) {
         if (its.it_value.tv_sec == 0 && its.it_value.tv_nsec == 0)
                 its.it_value.tv_nsec = 1;
 
-        if (timerfd_settime(e->watchdog_fd, TFD_TIMER_ABSTIME, &its, NULL) < 0)
+        r = timerfd_settime(e->watchdog_fd, TFD_TIMER_ABSTIME, &its, NULL);
+        if (r < 0)
                 return -errno;
 
         return 0;
@@ -3855,7 +3866,8 @@ _public_ int sd_event_now(sd_event *e, clockid_t clock, uint64_t *usec) {
                 return -EOPNOTSUPP;
 
         if (!triple_timestamp_is_set(&e->timestamp)) {
-                /* Implicitly fall back to now() if we never ran before and thus have no cached time. */
+                /* Implicitly fall back to now() if we never ran
+                 * before and thus have no cached time. */
                 *usec = now(clock);
                 return 1;
         }
@@ -3934,7 +3946,8 @@ _public_ int sd_event_set_watchdog(sd_event *e, int b) {
                         .data.ptr = INT_TO_PTR(SOURCE_WATCHDOG),
                 };
 
-                if (epoll_ctl(e->epoll_fd, EPOLL_CTL_ADD, e->watchdog_fd, &ev) < 0) {
+                r = epoll_ctl(e->epoll_fd, EPOLL_CTL_ADD, e->watchdog_fd, &ev);
+                if (r < 0) {
                         r = -errno;
                         goto fail;
                 }