Rename daylog_fn to opt_daylog_fn when parsing options.

[darkstat] / darkstat.c

diff --git a/darkstat.c b/darkstat.c
index 1dd3db9..8713998 100644 (file)
--- a/darkstat.c
+++ b/darkstat.c
@@ -129,14 +129,14 @@ static void cb_chroot(const char *arg) { opt_chroot_dir = arg; }
 const char *opt_privdrop_user = NULL;
 static void cb_user(const char *arg) { opt_privdrop_user = arg; }
 
-const char *daylog_fn = NULL;
+const char *opt_daylog_fn = NULL;
 static void cb_daylog(const char *arg)
 {
    if (opt_chroot_dir == NULL)
       errx(1, "the daylog file is relative to the chroot.\n"
       "You must specify a --chroot dir before you can use --daylog.");
    else
-      daylog_fn = arg;
+      opt_daylog_fn = arg;
 }
 
 const char *import_fn = NULL;
@@ -418,7 +418,7 @@ main(int argc, char **argv)
 
    /* Don't need root privs for these: */
    now_init();
-   if (daylog_fn != NULL) daylog_init(daylog_fn);
+   if (opt_daylog_fn != NULL) daylog_init(opt_daylog_fn);
    graph_init();
    hosts_db_init();
    if (import_fn != NULL) db_import(import_fn);
@@ -441,7 +441,6 @@ main(int argc, char **argv)
       struct timespec t;
       fd_set rs, ws;
 
-      timer_start(&t);
       FD_ZERO(&rs);
       FD_ZERO(&ws);
       cap_fd_set(&rs, &max_fd, &timeout, &use_timeout);
@@ -458,6 +457,7 @@ main(int argc, char **argv)
             err(1, "select()");
       }
 
+      timer_start(&t);
       now_update();
 
       if (export_pending) {
@@ -478,7 +478,7 @@ main(int argc, char **argv)
       cap_poll(&rs);
       dns_poll();
       http_poll(&rs, &ws);
-      timer_stop(&t, 1000000000, "event loop took longer than a second");
+      timer_stop(&t, 1000000000, "event processing took longer than a second");
    }
 
    verbosef("shutting down");
@@ -490,7 +490,7 @@ main(int argc, char **argv)
    if (export_fn != NULL) db_export(export_fn);
    hosts_db_free();
    graph_free();
-   if (daylog_fn != NULL) daylog_free();
+   if (opt_daylog_fn != NULL) daylog_free();
    ncache_free();
    if (pid_fn) pidfile_unlink();
    verbosef("shut down");