Cast time_t to long long when printing

[solanum.git] / librb / src / event.c

diff --git a/librb/src/event.c b/librb/src/event.c
index 14755cc0ac284b3347b7d42851e6382272e17abf..9f90b972606c7c6ddc5207d05fb9db752646b752 100644 (file)
--- a/librb/src/event.c
+++ b/librb/src/event.c
@@ -250,6 +250,7 @@ rb_event_run(void)
                        else
                        {
                                rb_dlinkDelete(&ev->node, &event_list);
+                               rb_free(ev->name);
                                rb_free(ev);
                        }
                }
@@ -293,23 +294,21 @@ rb_event_init(void)
 void
 rb_dump_events(void (*func) (char *, void *), void *ptr)
 {
-       int len;
        char buf[512];
        rb_dlink_node *dptr;
        struct ev_entry *ev;
-       len = sizeof(buf);
 
-       snprintf(buf, len, "Last event to run: %s", last_event_ran);
+       snprintf(buf, sizeof buf, "Last event to run: %s", last_event_ran);
        func(buf, ptr);
 
-       rb_strlcpy(buf, "Operation                    Next Execution", len);
+       rb_strlcpy(buf, "Operation                    Next Execution", sizeof buf);
        func(buf, ptr);
 
        RB_DLINK_FOREACH(dptr, event_list.head)
        {
                ev = dptr->data;
-               snprintf(buf, len, "%-28s %-4ld seconds (frequency=%d)", ev->name,
-                           ev->when - (long)rb_current_time(), (int)ev->frequency);
+               snprintf(buf, sizeof buf, "%-28s %-4lld seconds (frequency=%d)", ev->name,
+                           (long long)(ev->when - rb_current_time()), (int)ev->frequency);
                func(buf, ptr);
        }
 }