fix some cppcheck warnings

use cppcheck tools `cppcheck --enable=warning  .` on lxc source directory.

This patch fix the following warnning

```
[src/lxc/cgroups/cgfs.c:794]: (warning) %ld in format string (no. 3) requires 'long' but the argument type is 'unsigned long'.
[src/lxc/confile.c:4441]: (warning) %d in format string (no. 2) requires 'int' but the argument type is 'unsigned int'.
[src/lxc/confile.c:4502]: (warning) %d in format string (no. 2) requires 'int' but the argument type is 'unsigned int'.
[src/lxc/confile_legacy.c:921]: (warning) %d in format string (no. 2) requires 'int' but the argument type is 'unsigned int'.
[src/lxc/confile_legacy.c:938]: (warning) %d in format string (no. 2) requires 'int' but the argument type is 'unsigned int'.
[src/lxc/lxclock.c:63]: (warning) %zd in format string (no. 1) requires 'ssize_t' but the argument type is 'size_t {aka unsigned long}'.
[src/lxc/tools/lxc_info.c:118]: (warning) %u in format string (no. 1) requires 'unsigned int' but the argument type is 'signed int'.
[src/lxc/tools/lxc_info.c:118]: (warning) %u in format string (no. 2) requires 'unsigned int' but the argument type is 'signed int'.
[src/lxc/tools/lxc_info.c:123]: (warning) %u in format string (no. 1) requires 'unsigned int' but the argument type is 'signed int'.
[src/lxc/tools/lxc_info.c:127]: (warning) %u in format string (no. 1) requires 'unsigned int' but the argument type is 'signed int'.
[src/lxc/tools/lxc_info.c:130]: (warning) %u in format string (no. 1) requires 'unsigned int' but the argument type is 'signed int'.
[src/lxc/tools/lxc_top.c:212]: (warning) %u in format string (no. 1) requires 'unsigned int' but the argument type is 'signed int'.
[src/lxc/tools/lxc_top.c:212]: (warning) %u in format string (no. 2) requires 'unsigned int' but the argument type is 'signed int'.
[src/lxc/tools/lxc_top.c:217]: (warning) %u in format string (no. 1) requires 'unsigned int' but the argument type is 'signed int'.
[src/lxc/tools/lxc_top.c:221]: (warning) %u in format string (no. 1) requires 'unsigned int' but the argument type is 'signed int'.
[src/lxc/tools/lxc_top.c:224]: (warning) %u in format string (no. 1) requires 'unsigned int' but the argument type is 'signed int'.
```

Signed-off-by: Long Wang <w@laoqinren.net>

diff --git a/src/lxc/cgfs.c b/src/lxc/cgfs.c
index 18d5151df265486d0e373a8762fc47115140f175..43c715f36ea9bca397f4761c44dedf4e66c804d7 100644 (file)
--- a/src/lxc/cgfs.c
+++ b/src/lxc/cgfs.c
@@ -774,7 +774,7 @@ static char *cgroup_rename_nsgroup(const char *mountpath, const char *oldname, p
 
        len = strlen(oldname) + strlen(mountpath) + 22;
        fulloldpath = alloca(len);
-       ret = snprintf(fulloldpath, len, "%s/%s/%ld", mountpath, oldname, (unsigned long)pid);
+       ret = snprintf(fulloldpath, len, "%s/%s/%lu", mountpath, oldname, (unsigned long)pid);
        if (ret < 0 || ret >= len)
                return NULL;
 

diff --git a/src/lxc/lxc_info.c b/src/lxc/lxc_info.c
index ac9ff4a13415e5fe6019df18f53bfb6cfd28c881..db4253c90f949cdec8817735ee238d948eef9d94 100644 (file)
--- a/src/lxc/lxc_info.c
+++ b/src/lxc/lxc_info.c
@@ -115,18 +115,18 @@ static void size_humanize(unsigned long long val, char *buf, size_t bufsz)
 {
        if (val > 1 << 30) {
                snprintf(buf, bufsz, "%u.%2.2u GiB",
-                           (int)(val >> 30),
-                           (int)(val & ((1 << 30) - 1)) / 10737419);
+                           (unsigned int)(val >> 30),
+                           (unsigned int)(val & ((1 << 30) - 1)) / 10737419);
        } else if (val > 1 << 20) {
-               int x = val + 5243;  /* for rounding */
+               unsigned int x = val + 5243;  /* for rounding */
                snprintf(buf, bufsz, "%u.%2.2u MiB",
                            x >> 20, ((x & ((1 << 20) - 1)) * 100) >> 20);
        } else if (val > 1 << 10) {
-               int x = val + 5;  /* for rounding */
+               unsigned int x = val + 5;  /* for rounding */
                snprintf(buf, bufsz, "%u.%2.2u KiB",
                            x >> 10, ((x & ((1 << 10) - 1)) * 100) >> 10);
        } else {
-               snprintf(buf, bufsz, "%u bytes", (int)val);
+               snprintf(buf, bufsz, "%u bytes", (unsigned int)val);
        }
 }
 

diff --git a/src/lxc/lxclock.c b/src/lxc/lxclock.c
index ac4d5791faa50d1e0b1e8076600b58256bc42f4c..2871c5af87081ab28f929e7d2d421e9d441de5d1 100644 (file)
--- a/src/lxc/lxclock.c
+++ b/src/lxc/lxclock.c
@@ -60,7 +60,7 @@ static inline void dump_stacktrace(void)
        strings = backtrace_symbols(array, size);
 
        // Using fprintf here as our logging module is not thread safe
-       fprintf(stderr, "\tObtained %zd stack frames.\n", size);
+       fprintf(stderr, "\tObtained %zu stack frames.\n", size);
 
        for (i = 0; i < size; i++)
                fprintf(stderr, "\t\t%s\n", strings[i]);