]> granicus.if.org Git - vnstat/commitdiff
fix comparisons of previous commit
authorTeemu Toivola <git@humdi.net>
Sun, 28 Apr 2019 11:49:11 +0000 (14:49 +0300)
committerTeemu Toivola <git@humdi.net>
Sun, 28 Apr 2019 11:49:11 +0000 (14:49 +0300)
src/dbshow.c
src/image.c

index 7da5ffe9b44cc30106a061612b8d948cf786ad0d..96df35551323a9bd38971f592ec6335ef21d58cf 100644 (file)
@@ -465,7 +465,7 @@ void showlist(const interfaceinfo *interface, const char *listname, const char *
                                } else if (listtype == 5) { // hour
                                        e_secs = (uint64_t)(d->tm_sec + (d->tm_min * 60));
                                } else if (listtype == 6) { // 5min
-                                       if ((&interface->updated - ((uint64_t)&interface->updated % 300)) == (&datalist_i->timestamp - ((uint64_t)&datalist_i->timestamp % 300))) {
+                                       if ((interface->updated - (interface->updated % 300)) == (datalist_i->timestamp - (datalist_i->timestamp % 300))) {
                                                e_secs = (uint64_t)(d->tm_sec + (d->tm_min % 5 * 60));
                                        } else {
                                                e_secs = 300;
index 60cd9a9c8837f7414a43b4aec937b26b7d02bfa7..e72355e7729e858558e6a55c0f0c52a6fe30caf8 100644 (file)
@@ -703,7 +703,7 @@ void drawlist(IMAGECONTENT *ic, const char *listname)
                                } else if (listtype == 5) { // hour
                                        e_secs = (uint64_t)(d->tm_sec + (d->tm_min * 60));
                                } else if (listtype == 6) { // 5min
-                                       if ((&ic->interface.updated - ((uint64_t)&ic->interface.updated % 300)) == (&datalist_i->timestamp - ((uint64_t)&datalist_i->timestamp % 300))) {
+                                       if ((ic->interface.updated - (ic->interface.updated % 300)) == (datalist_i->timestamp - (datalist_i->timestamp % 300))) {
                                                e_secs = (uint64_t)(d->tm_sec + (d->tm_min % 5 * 60));
                                        } else {
                                                e_secs = 300;