daemon: Use macros to make time deltas easier to understand

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/pakfire/daemon.c b/src/pakfire/daemon.c
index a2f9f47bbd9ef842babc4dfa9831c25dbb91a009..a440209ce32e8f2538994e0709a2df22eaac3e15 100644 (file)
--- a/src/pakfire/daemon.c
+++ b/src/pakfire/daemon.c
@@ -679,7 +679,7 @@ static int pakfire_daemon_close(struct pakfire_xfer* xfer, int code, void* data)
        }
 
        INFO(daemon->ctx, "Will attempt to reconnect in %u second(s)\n",
-               daemon->reconnect_holdoff / 1000000);
+               daemon->reconnect_holdoff / S_TO_US(1));
 
        // Set the reconnection timer
        r = sd_event_source_set_time_relative(daemon->connect_timer, daemon->reconnect_holdoff);
@@ -699,8 +699,8 @@ static int pakfire_daemon_close(struct pakfire_xfer* xfer, int code, void* data)
        daemon->reconnect_holdoff *= 2;
 
        // Cap reconnection attempts to every minute
-       if (daemon->reconnect_holdoff > 60000000)
-               daemon->reconnect_holdoff = 60000000;
+       if (daemon->reconnect_holdoff > S_TO_US(60))
+               daemon->reconnect_holdoff = S_TO_US(60);
 
        // Disable sending stats until we are connected
        r = sd_event_source_set_enabled(daemon->stats_timer, SD_EVENT_OFF);
@@ -759,7 +759,7 @@ static int pakfire_daemon_connected(struct pakfire_xfer* xfer, void* data) {
        daemon->control = pakfire_xfer_ref(xfer);
 
        // Reset the holdoff timer
-       daemon->reconnect_holdoff = 1000000;
+       daemon->reconnect_holdoff = S_TO_US(1);
 
        // Submit stats continuously
        r = sd_event_source_set_enabled(daemon->stats_timer, SD_EVENT_ON);
@@ -1019,7 +1019,7 @@ static int pakfire_daemon_auth(sd_event_source* s, uint64_t usec, void* data) {
        }
 
        // Refresh one hour before the expiry time
-       uint64_t t_refresh = (t_end - 3600) * 1000000;
+       uint64_t t_refresh = (t_end - 3600) * S_TO_US(1);
 
        // Authenticate again just before the credentials expire
        r = sd_event_source_set_time(daemon->auth_timer, t_refresh);
@@ -1333,7 +1333,7 @@ int pakfire_daemon_create(struct pakfire_daemon** daemon, struct pakfire_ctx* ct
                goto ERROR;
 
        // Reconnect after one second
-       d->reconnect_holdoff = 1000000;
+       d->reconnect_holdoff = S_TO_US(1);
 
        // Return the pointer
        *daemon = d;