Use time_t instead of long in graph_db.c

diff --git a/daylog.c b/daylog.c
index d443dcf..fe1928f 100644 (file)
--- a/daylog.c
+++ b/daylog.c
@@ -86,8 +86,8 @@ static void daylog_write(const char *format, ...) {
 }
 
 static void daylog_emit(void) {
-   daylog_write("%s|%ld|%qu|%qu|%qu|%qu\n",
-                fmt_date(today_real), (long)today_real,
+   daylog_write("%s|%qu|%qu|%qu|%qu|%qu\n",
+                fmt_date(today_real), (uint64_t)today_real,
                 bytes_in, bytes_out, pkts_in, pkts_out);
 }
 
@@ -99,15 +99,15 @@ void daylog_init(const char *filename) {
             (long)today_real, (long)tomorrow_real);
    bytes_in = bytes_out = pkts_in = pkts_out = 0;
 
-   daylog_write("# logging started at %s (%ld)\n",
-                fmt_date(today_real), (long)today_real);
+   daylog_write("# logging started at %s (%qu)\n",
+                fmt_date(today_real), (uint64_t)today_real);
 }
 
 void daylog_free(void) {
    today_real = now_real();
    daylog_emit(); /* Emit what's currently accumulated before we exit. */
-   daylog_write("# logging stopped at %s (%ld)\n",
-                fmt_date(today_real), (long)today_real);
+   daylog_write("# logging stopped at %s (%qu)\n",
+                fmt_date(today_real), (uint64_t)today_real);
 }
 
 void daylog_acct(uint64_t amount, enum graph_dir dir) {

diff --git a/graph_db.c b/graph_db.c
index bc774b4..56f43c5 100644 (file)
--- a/graph_db.c
+++ b/graph_db.c
@@ -131,7 +131,7 @@ static void rotate(struct graph *g, const unsigned int pos) {
    g->pos = pos;
 }
 
-static void graph_resync(const long new_time) {
+static void graph_resync(const time_t new_real) {
    struct tm *tm;
    /*
     * If real time went backwards, we assume that the time adjustment should
@@ -154,9 +154,9 @@ static void graph_resync(const long new_time) {
     * We rely on graph advancement to happen at the correct real time to
     * account for, for example, bandwidth used per day.
     */
-   assert(new_time < last_real);
+   assert(new_real < last_real);
 
-   tm = localtime(&new_time);
+   tm = localtime(&new_real);
    if (tm->tm_sec == 60)
       tm->tm_sec = 59; /* mis-handle leap seconds */
 
@@ -165,7 +165,7 @@ static void graph_resync(const long new_time) {
    rotate(&graph_hrs, tm->tm_hour);
    rotate(&graph_days, tm->tm_mday - 1);
 
-   last_real = new_time;
+   last_real = new_real;
 }
 
 void graph_rotate(void) {