Fx misc compiler warnings

src/vnstat.h:7:33: warning: identifier ‘delete’ conflicts with C++ keyword [-Wc++-compat]

src/ifinfo.c:61:13: warning: request for implicit conversion from ‘void *’ to ‘char *’ not permitted in C++ [-Wc++-compat]

src/dbxml.c:110:16: warning: initialization discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers]

src/dbjson.c:134:16: warning: initialization discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers]

src/common.c:270:6: warning: function might be candidate for attribute ‘noreturn’ [-Wsuggest-attribute=noreturn]

src/misc.c:309:32: warning: initialization discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers]

src/ibw.c:34:5: warning: request for implicit conversion from ‘void *’ to ‘ibwnode * {aka struct ibwnode *}’ not permitted in C++ [-Wc++-compat]

src/image.c:68:17: warning: passing argument 1 of ‘colorinitcheck’ discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers]

src/dbcache.c:26:4: warning: request for implicit conversion from ‘void *’ to ‘datanode * {aka struct datanode *}’ not permitted in C++ [-Wc++-compat]

src/ifinfo.c:358:4: warning: unsuffixed float constant [-Wunsuffixed-float-constants]

src/common.c:173:14: warning: nested extern declaration of ‘timezone’ [-Wnested-externs]
src/common.c:173:14: warning: redundant redeclaration of ‘timezone’ [-Wredundant-decls]

diff --git a/src/common.c b/src/common.c
index 914a1dacf1454b20b9222488097fce56c8b9970b..1a3cb94a5f4bd5fa98517362164637541ee5d438 100644 (file)
--- a/src/common.c
+++ b/src/common.c
@@ -170,7 +170,7 @@ uint32_t mosecs(void)
 {
        struct tm d;
 #if defined(_SVID_SOURCE) || defined(_XOPEN_SOURCE) || defined(__linux__)
-       extern long timezone;
+       /* extern long timezone; */
 #else
        int timezone = 0;
 #endif
@@ -267,6 +267,7 @@ int isnumeric(const char *s)
        return 1;
 }
 
+__attribute__((noreturn))
 void panicexit(const char *sourcefile, const int sourceline)
 {
        snprintf(errorstring, 512, "Unexpected error (%s), exiting. (%s:%d)\n", strerror(errno), sourcefile, sourceline);

diff --git a/src/common.h b/src/common.h
index fbaf4ad2dadff29315c20d569cd7153df3638dbe..70f9d94708e0b090c75401240a62b9c729d00602 100644 (file)
--- a/src/common.h
+++ b/src/common.h
@@ -307,7 +307,7 @@ void addtraffic(uint64_t *destmb, int *destkb, const uint64_t srcmb, const int s
 uint64_t mbkbtokb(uint64_t mb, uint64_t kb);
 char *strncpy_nt(char *dest, const char *src, size_t n);
 int isnumeric(const char *s);
-void panicexit(const char *sourcefile, const int sourceline);
+void panicexit(const char *sourcefile, const int sourceline) __attribute__((noreturn));
 char *getversion(void);
 
 /* global variables */

diff --git a/src/dbcache.c b/src/dbcache.c
index a4329d63a19e0bed4f38d379ace09edd54e10e12..6b852596f07eb7e72cf4b162b56dc5e3102bce53 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 = 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 = malloc(sizeof(datanode));
+       n = (datanode *) malloc(sizeof(datanode));
 
        if (n == NULL) {
                return 0;

diff --git a/src/dbjson.c b/src/dbjson.c
index 2d4a5c1a9650dd4f74d8544ff77ce2f575987107..c6eb9481a239722a7c36405f54550aeea6720bef 100644 (file)
--- a/src/dbjson.c
+++ b/src/dbjson.c
@@ -131,9 +131,9 @@ void jsonhours(void)
 void jsondate(time_t *date, int type)
 {
        struct tm *d;
-       char *type1 = "\"date\":{\"year\":%d,\"month\":%d,\"day\":%d}";
-       char *type2 = "\"date\":{\"year\":%d,\"month\":%d,\"day\":%d},\"time\":{\"hour\":%d,\"minutes\":%d}";
-       char *type3 = "\"date\":{\"year\":%d,\"month\":%d}";
+       const char *type1 = "\"date\":{\"year\":%d,\"month\":%d,\"day\":%d}";
+       const char *type2 = "\"date\":{\"year\":%d,\"month\":%d,\"day\":%d},\"time\":{\"hour\":%d,\"minutes\":%d}";
+       const char *type3 = "\"date\":{\"year\":%d,\"month\":%d}";
 
        d = localtime(date);
 

diff --git a/src/dbxml.c b/src/dbxml.c
index b3eddf7b8e7ad86ca8c4b4847ecb93cf8f4d4947..674080ab3e05be9e213d22424d77a050ba4682fa 100644 (file)
--- a/src/dbxml.c
+++ b/src/dbxml.c
@@ -107,9 +107,9 @@ void xmlhours(void)
 void xmldate(time_t *date, int type)
 {
        struct tm *d;
-       char *type1 = "<date><year>%d</year><month>%02d</month><day>%02d</day></date>";
-       char *type2 = "<date><year>%d</year><month>%02d</month><day>%02d</day></date><time><hour>%02d</hour><minute>%02d</minute></time>";
-       char *type3 = "<date><year>%d</year><month>%02d</month></date>";
+       const char *type1 = "<date><year>%d</year><month>%02d</month><day>%02d</day></date>";
+       const char *type2 = "<date><year>%d</year><month>%02d</month><day>%02d</day></date><time><hour>%02d</hour><minute>%02d</minute></time>";
+       const char *type3 = "<date><year>%d</year><month>%02d</month></date>";
 
        d = localtime(date);
 

diff --git a/src/ibw.c b/src/ibw.c
index 5510d305ecd3f4f9744ff4b5672f8a2d312abc08..4741b2bcd099ef876f0cb62de778f487b0b52c64 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 = 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 = malloc(sizeof(ibwnode));
+               n =  (ibwnode *) malloc(sizeof(ibwnode));
 
                if (n == NULL) {
                        return 0;

diff --git a/src/ifinfo.c b/src/ifinfo.c
index 6a5d25de875610a9bd9ef1fef8ba08d4e227ab76..0356308deb49da8f002a6610f0cd86184cb2ddfd 100644 (file)
--- a/src/ifinfo.c
+++ b/src/ifinfo.c
@@ -58,7 +58,7 @@ int getiflist(char **ifacelist, int showspeed)
 #endif
 
        /* initialize list */
-       *ifacelist = 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 = 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 = 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 = 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 = 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__);
                                        }
@@ -355,7 +355,7 @@ void parseifinfo(int newdb)
 
                        /* calculate maximum possible transfer since last update based on set maximum rate */
                        /* and add 10% in order to be on the safe side */
-                       maxtransfer = ceil((maxbw/(float)8)*interval*(float)1.1);
+                       maxtransfer = ceilf((maxbw/8.0f)*interval*1.1f);
 
                        if (debug)
                                printf("interval: %"PRIu64"  maxbw: %"PRIu32"  maxrate: %"PRIu64"  rxc: %"PRIu64"  txc: %"PRIu64"\n", (uint64_t)interval, maxbw, maxtransfer, rxchange, txchange);

diff --git a/src/image.c b/src/image.c
index 3cfddca0020e8c43faf6931fcd3f9cd6a1c44b3b..6f9038d86da33ab48eecc61acc0d2870dfee87a7 100644 (file)
--- a/src/image.c
+++ b/src/image.c
@@ -128,7 +128,7 @@ void colorinit(IMAGECONTENT *ic)
        colorinitcheck("ctxd", ic->ctxd, cfg.ctxd, rgb);
 }
 
-void colorinitcheck(char *color, int value, char *cfgtext, int *rgb)
+void colorinitcheck(const char *color, int value, const char *cfgtext, const int *rgb)
 {
        if (value==-1) {
                printf("Error: ImageColorAllocate failed.\n");

diff --git a/src/image.h b/src/image.h
index e9188384d40f5179dcbdadf8c7a8437c0e45771e..552808d7a3eae2a6b4a57e6b288715c032b912e5 100644 (file)
--- a/src/image.h
+++ b/src/image.h
@@ -27,7 +27,7 @@ typedef struct {
 void initimagecontent(IMAGECONTENT *ic);
 void drawimage(IMAGECONTENT *ic);
 void colorinit(IMAGECONTENT *ic);
-void colorinitcheck(char *color, int value, char *cfgtext, int *rgb);
+void colorinitcheck(const char *color, int value, const char *cfgtext, const int *rgb);
 void layoutinit(IMAGECONTENT *ic, char *title, int width, int height);
 void drawlegend(IMAGECONTENT *ic, int x, int y);
 void drawbar(IMAGECONTENT *ic, int x, int y, int len, uint64_t rx, int rxk, uint64_t tx, int txk, uint64_t max);

diff --git a/src/misc.c b/src/misc.c
index 9842448c820085279cb2d47e82cfae08c51aea37..cfc7295bd22b9c74166eec0133883a00902d9224 100644 (file)
--- a/src/misc.c
+++ b/src/misc.c
@@ -304,9 +304,9 @@ uint64_t getscale(uint64_t kb)
        return result;
 }
 
-char *getunitprefix(int index)
+const char *getunitprefix(int index)
 {
-       static char *unitprefix[] = { "na", "KiB", "MiB", "GiB", "TiB",
+       static const char *unitprefix[] = { "na", "KiB", "MiB", "GiB", "TiB",
                                    "KB",  "MB",  "GB",  "TB" };
 
        if (index>UNITPREFIXCOUNT) {
@@ -316,9 +316,9 @@ char *getunitprefix(int index)
        }
 }
 
-char *getrateunitprefix(int unitmode, int index)
+const char *getrateunitprefix(int unitmode, int index)
 {
-       static char *rateunitprefix[] = { "na", "KiB/s", "MiB/s", "GiB/s", "TiB/s",
+       static const char *rateunitprefix[] = { "na", "KiB/s", "MiB/s", "GiB/s", "TiB/s",
                                     "KB/s",  "MB/s",  "GB/s",  "TB/s",
                                     "Kibit/s",  "Mibit/s",  "Gibit/s",  "Tibit/s",
                                     "kbit/s",  "Mbit/s",  "Gbit/s",  "Tbit/s" };

diff --git a/src/misc.h b/src/misc.h
index 9910e1165373421879e69335fa870b8edd268932..75d29d6145898e60f7f9995fc8a7315a75a66db6 100644 (file)
--- a/src/misc.h
+++ b/src/misc.h
@@ -11,8 +11,8 @@ char *getvalue(uint64_t mb, uint64_t kb, int len, int type);
 char *getrate(uint64_t mb, uint64_t kb, uint32_t interval, int len);
 char *gettrafficrate(uint64_t bytes, uint32_t interval, int len);
 uint64_t getscale(uint64_t kb);
-char *getunitprefix(int index);
-char *getrateunitprefix(int unitmode, int index);
+const char *getunitprefix(int index);
+const char *getrateunitprefix(int unitmode, int index);
 uint64_t getunitdivisor(int unitmode, int index);
 char *getratestring(uint64_t rate, int len, int declen, int unitmode);
 int getpadding(int len, char *str);

diff --git a/src/vnstat.c b/src/vnstat.c
index 43880ac59d7ef001dbfb2e7a60eece6f85620b9b..3a2139ec8f98394e1bb4b65ae8ea0caef28e1c8b 100644 (file)
--- a/src/vnstat.c
+++ b/src/vnstat.c
@@ -297,7 +297,7 @@ int main(int argc, char *argv[]) {
                        printcfgfile();
                        return 0;
                } else if (strcmp(argv[currentarg],"--delete")==0) {
-                       p.delete=1;
+                       p.del=1;
                        p.query=0;
                } else if (strcmp(argv[currentarg],"--iflist")==0) {
                        getiflist(&p.ifacelist, 1);
@@ -421,7 +421,7 @@ void initparams(PARAMS *p)
        p->traffic = 0;
        p->livetraffic = 0;
        p->defaultiface = 1;
-       p->delete=0;
+       p->del=0;
        p->livemode = 0;
        p->ifacelist = NULL;
        p->cfgfile[0] = '\0';
@@ -612,7 +612,7 @@ void handlecountersync(PARAMS *p)
 
 void handledelete(PARAMS *p)
 {
-       if (!p->delete) {
+       if (!p->del) {
                return;
        }
 

diff --git a/src/vnstat.h b/src/vnstat.h
index 181e03c6d87ce0418a2b57a77077181fed7d7295..7c8148d6e325c6c9fd2929b4d61bf180c0227aeb 100644 (file)
--- a/src/vnstat.h
+++ b/src/vnstat.h
@@ -4,7 +4,7 @@
 typedef struct {
        int update, query, newdb, reset, sync, merged, savemerged, import;
        int create, active, files, force, cleartop, rebuildtotal, traffic;
-       int livetraffic, defaultiface, delete, livemode;
+       int livetraffic, defaultiface, del, livemode;
        char interface[32], dirname[512], nick[32], filename[512];
        char definterface[32], cfgfile[512], *ifacelist, jsonmode, xmlmode;
 } PARAMS;