fix compile warnings

src/daemon.c:176:13: warning: use of non-standard escape character '\%' [-Wpedantic]
src/dbcache.c:333:33: warning: declaration shadows a variable in the global scope [-Wshadow]

diff --git a/src/daemon.c b/src/daemon.c
index 811dfef88c27c89182e7c1d3105d2109b4c5835d..7b9d52b5696fe77b5a47698c09b68f3e0f81536e 100644 (file)
--- a/src/daemon.c
+++ b/src/daemon.c
@@ -173,7 +173,7 @@ int addinterfaces(const char *dirname, const int running)
                        }
                } else {
                        if (debug)
-                               printf("\%s\" added with %"PRIu32" Mbit bandwidth limit to cache.\n", interface, bwlimit);
+                               printf("\"%s\" added with %"PRIu32" Mbit bandwidth limit to cache.\n", interface, bwlimit);
                        cacheadd(interface, 1);
                }
        }

diff --git a/src/dbcache.c b/src/dbcache.c
index a3b717f103b90a478b8b657257d956cc3112516f..a4329d63a19e0bed4f38d379ace09edd54e10e12 100644 (file)
--- a/src/dbcache.c
+++ b/src/dbcache.c
@@ -330,19 +330,19 @@ uint32_t dbcheck(uint32_t dbhash, int *forcesave)
        return newhash;
 }
 
-uint32_t simplehash(const char *data, int len)
+uint32_t simplehash(const char *input, int len)
 {
        uint32_t hash = len;
 
-       if (len <= 0 || data == NULL) {
+       if (len <= 0 || input == NULL) {
                return 0;
        }
 
        for (len--; len >= 0; len--) {
                if (len > 0) {
-                       hash += (int)data[len] * len;
+                       hash += (int)input[len] * len;
                } else {
-                       hash += (int)data[len];
+                       hash += (int)input[len];
                }
        }
 

diff --git a/src/dbcache.h b/src/dbcache.h
index 928e426f0a5fb8d0c2bffbb589b24d96ba290056..ad2e84c558c00469bdd344346d4dc710eaf73ce4 100644 (file)
--- a/src/dbcache.h
+++ b/src/dbcache.h
@@ -18,7 +18,7 @@ void cacheflush(const char *dirname);
 int cachecount(void);
 int cacheactivecount(void);
 uint32_t dbcheck(uint32_t dbhash, int *forcesave);
-uint32_t simplehash(const char *data, int len);
+uint32_t simplehash(const char *input, int len);
 
 /* global variables */
 datanode *dataptr;