update CHANGES and year info, minor style cleanup

diff --git a/CHANGES b/CHANGES
index 047d7e7e6d98cd336687bcbe467a85c610835faf..da18923c569a871900829515e58cd03d52eeb1f3 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,12 @@
 1.18 / <not released yet>
 
+ - Fix: Misspellings, compiler warnings and possible error situations
+   (pull requests by Christian Göttsche)
+ - Add RTC sanity check and sync wait to daemon startup, the possible wait
+   duration can be configured using the TimeSyncWait keyword
+ - Add optional parameter to --oneline output for forcing fields to output
+   in bytes
+
 
 1.17 / 16-Feb-2017
 

diff --git a/man/vnstat.1 b/man/vnstat.1
index 9e6e5946908bc1fefeee4910b1dbfc39a3f312c4..749f6a5fe8b2b4658b1bd077c0fd1c925278f2c0 100644 (file)
--- a/man/vnstat.1
+++ b/man/vnstat.1
@@ -1,4 +1,4 @@
-.TH VNSTAT 1 "FEBRUARY 2017" "version 1.17" "User Manuals"
+.TH VNSTAT 1 "FEBRUARY 2018" "version 1.18" "User Manuals"
 .SH NAME
 
 vnstat \- a console-based network traffic monitor

diff --git a/man/vnstat.conf.5 b/man/vnstat.conf.5
index d679443ffc740929f02180cc3de206ace80d043a..8005ba6049032164bfab65440d5151f74e0054ba 100644 (file)
--- a/man/vnstat.conf.5
+++ b/man/vnstat.conf.5
@@ -1,4 +1,4 @@
-.TH VNSTAT.CONF 5 "FEBRUARY 2017" "version 1.17" "User Manuals"
+.TH VNSTAT.CONF 5 "FEBRUARY 2018" "version 1.18" "User Manuals"
 .SH NAME
 
 vnstat.conf \- vnStat configuration file

diff --git a/man/vnstatd.1 b/man/vnstatd.1
index d9cfce6c37102c38c244ecd2f115abce1b02b32c..47b1b3612c72400a44576349470f2661d969dad5 100644 (file)
--- a/man/vnstatd.1
+++ b/man/vnstatd.1
@@ -1,4 +1,4 @@
-.TH VNSTATD 1 "FEBRUARY 2017" "version 1.17" "User Manuals"
+.TH VNSTATD 1 "FEBRUARY 2018" "version 1.18" "User Manuals"
 .SH NAME
 
 vnstatd \- daemon based database updating for vnStat

diff --git a/man/vnstati.1 b/man/vnstati.1
index 159301d2d778f48c61affa33760a325a56621226..b2d4f56870e6bfed8efe00875eec984d2fc4c58a 100644 (file)
--- a/man/vnstati.1
+++ b/man/vnstati.1
@@ -1,4 +1,4 @@
-.TH VNSTATI 1 "FEBRUARY 2017" "version 1.17" "User Manuals"
+.TH VNSTATI 1 "FEBRUARY 2018" "version 1.18" "User Manuals"
 .SH NAME
 
 vnstati \- png image output support for vnStat

diff --git a/src/dbaccess.c b/src/dbaccess.c
index fe773c42af4eeb603a14a056c23eec800d8faf21..ab7c313feea6de0315344915ed045eb94d7b9c38 100644 (file)
--- a/src/dbaccess.c
+++ b/src/dbaccess.c
@@ -34,12 +34,12 @@ int readdb(const char *iface, const char *dirname, const int force)
                }
        } else {
                if (debug) {
-                       data.interface[sizeof(data.interface) - 1] = 0;
+                       data.interface[sizeof(data.interface) - 1] = '\0';
                        printf("db: Database loaded for interface \"%s\"...\n", data.interface);
                }
        }
-       data.interface[sizeof(data.interface) - 1] = 0;
-       data.nick[sizeof(data.nick) - 1] = 0;
+       data.interface[sizeof(data.interface) - 1] = '\0';
+       data.nick[sizeof(data.nick) - 1] = '\0';
 
        if (data.version == DBVERSION) {
                if (!validatedb() && !force) {
@@ -89,12 +89,12 @@ int readdb(const char *iface, const char *dirname, const int force)
                                }
                        } else {
                                if (debug) {
-                                       data.interface[sizeof(data.interface) - 1] = 0;
+                                       data.interface[sizeof(data.interface) - 1] = '\0';
                                        printf("db: Backup database loaded for interface \"%s\"...\n", data.interface);
                                }
                        }
-                       data.interface[sizeof(data.interface) - 1] = 0;
-                       data.nick[sizeof(data.nick) - 1] = 0;
+                       data.interface[sizeof(data.interface) - 1] = '\0';
+                       data.nick[sizeof(data.nick) - 1] = '\0';
 
                        if (data.version == DBVERSION) {
                                if (!validatedb()) {

diff --git a/src/dbcache.c b/src/dbcache.c
index 6b852596f07eb7e72cf4b162b56dc5e3102bce53..872947d9223cc94e5c4a802382c2175c9f93a031 100644 (file)
--- a/src/dbcache.c
+++ b/src/dbcache.c
@@ -23,7 +23,7 @@ int cacheadd(const char *iface, int sync)
        }
 
        /* add new node if not in list */
-       n = (datanode *)  malloc(sizeof(datanode));
+       n = (datanode *)malloc(sizeof(datanode));
 
        if (n == NULL) {
                return 0;
@@ -109,7 +109,7 @@ int cacheupdate(void)
        }
 
        /* add new node if not in list */
-       n = (datanode *) malloc(sizeof(datanode));
+       n = (datanode *)malloc(sizeof(datanode));
 
        if (n == NULL) {
                return 0;

diff --git a/src/ibw.c b/src/ibw.c
index 4741b2bcd099ef876f0cb62de778f487b0b52c64..c6cd9c3c315efbc3f9ea6e7501339fe371b833f9 100644 (file)
--- a/src/ibw.c
+++ b/src/ibw.c
@@ -31,7 +31,7 @@ int ibwadd(const char *iface, const uint32_t limit)
        /* add new node if list is empty */
        if (p == NULL) {
 
-               n = (ibwnode *) malloc(sizeof(ibwnode));
+               n = (ibwnode *)malloc(sizeof(ibwnode));
 
                if (n == NULL) {
                        return 0;
@@ -57,7 +57,7 @@ int ibwadd(const char *iface, const uint32_t limit)
                }
 
                /* add new node if not found */
-               n =  (ibwnode *) malloc(sizeof(ibwnode));
+               n =  (ibwnode *)malloc(sizeof(ibwnode));
 
                if (n == NULL) {
                        return 0;

diff --git a/src/ifinfo.c b/src/ifinfo.c
index 0356308deb49da8f002a6610f0cd86184cb2ddfd..8565307175571742fdee95fd005bcc3f2b034efe 100644 (file)
--- a/src/ifinfo.c
+++ b/src/ifinfo.c
@@ -58,7 +58,7 @@ int getiflist(char **ifacelist, int showspeed)
 #endif
 
        /* initialize list */
-       *ifacelist = (char *) malloc(sizeof(char));
+       *ifacelist = (char *)malloc(sizeof(char));
        if (*ifacelist == NULL) {
                panicexit(__FILE__, __LINE__);
        }
@@ -72,7 +72,7 @@ int getiflist(char **ifacelist, int showspeed)
                        sscanf(procline, "%63s", temp);
                        if (strlen(temp)>0 && (isdigit(temp[(strlen(temp)-1)]) || temp[(strlen(temp)-1)]==':')) {
                                sscanf(temp, "%31[^':']s", interface);
-                               *ifacelist = (char *) realloc(*ifacelist, ( ( strlen(*ifacelist) + strlen(interface) + 2 ) * sizeof(char)) );
+                               *ifacelist = (char *)realloc(*ifacelist, ( ( strlen(*ifacelist) + strlen(interface) + 2 ) * sizeof(char)) );
                                if (*ifacelist == NULL) {
                                        panicexit(__FILE__, __LINE__);
                                }
@@ -84,7 +84,7 @@ int getiflist(char **ifacelist, int showspeed)
                                speed = getifspeed(interface);
                                if (speed > 0) {
                                        snprintf(temp, 64, "(%u Mbit) ", speed);
-                                       *ifacelist = (char *) realloc(*ifacelist, ( ( strlen(*ifacelist) + strlen(temp) + 1 ) * sizeof(char)) );
+                                       *ifacelist = (char *)realloc(*ifacelist, ( ( strlen(*ifacelist) + strlen(temp) + 1 ) * sizeof(char)) );
                                        if (*ifacelist == NULL) {
                                                panicexit(__FILE__, __LINE__);
                                        }
@@ -105,7 +105,7 @@ int getiflist(char **ifacelist, int showspeed)
                                if (di->d_name[0] == '.' || strlen(di->d_name) > 31) {
                                        continue;
                                }
-                               *ifacelist = (char *) realloc(*ifacelist, ( ( strlen(*ifacelist) + strlen(di->d_name) + 2 ) * sizeof(char)) );
+                               *ifacelist = (char *)realloc(*ifacelist, ( ( strlen(*ifacelist) + strlen(di->d_name) + 2 ) * sizeof(char)) );
                                if (*ifacelist == NULL) {
                                        panicexit(__FILE__, __LINE__);
                                }
@@ -117,7 +117,7 @@ int getiflist(char **ifacelist, int showspeed)
                                speed = getifspeed(di->d_name);
                                if (speed > 0) {
                                        snprintf(temp, 64, "(%u Mbit) ", speed);
-                                       *ifacelist = (char *) realloc(*ifacelist, ( ( strlen(*ifacelist) + strlen(temp) + 1 ) * sizeof(char)) );
+                                       *ifacelist = (char *)realloc(*ifacelist, ( ( strlen(*ifacelist) + strlen(temp) + 1 ) * sizeof(char)) );
                                        if (*ifacelist == NULL) {
                                                panicexit(__FILE__, __LINE__);
                                        }

diff --git a/src/vnstat.c b/src/vnstat.c
index e187814353704090a0774bc664ee1c7b0f7c2d37..65a7b40e8ec902ae52bc3ed2b0d4f781a13eac02 100644 (file)
--- a/src/vnstat.c
+++ b/src/vnstat.c
@@ -1,5 +1,5 @@
 /*
-vnStat - Copyright (c) 2002-2016 Teemu Toivola <tst@iki.fi>
+vnStat - Copyright (c) 2002-2018 Teemu Toivola <tst@iki.fi>
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

diff --git a/src/vnstatd.c b/src/vnstatd.c
index 78ef9fba3c333dca405898347cdc3eba8157ec23..c3031da339471440243f6d9df82e0d81f315865f 100644 (file)
--- a/src/vnstatd.c
+++ b/src/vnstatd.c
@@ -1,5 +1,5 @@
 /*
-vnStat daemon - Copyright (c) 2008-2016 Teemu Toivola <tst@iki.fi>
+vnStat daemon - Copyright (c) 2008-2018 Teemu Toivola <tst@iki.fi>
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

diff --git a/src/vnstati.c b/src/vnstati.c
index 2343619f2653e8a6805cae74d69aca0f44114b04..9a1994f04ab6e48eab60bf5bc529ae35640203fd 100644 (file)
--- a/src/vnstati.c
+++ b/src/vnstati.c
@@ -1,5 +1,5 @@
 /*
-vnStat image output - Copyright (c) 2007-2016 Teemu Toivola <tst@iki.fi>
+vnStat image output - Copyright (c) 2007-2018 Teemu Toivola <tst@iki.fi>
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by