chiark / gitweb /
build-sys: minor fixes found with cppcheck
authorLennart Poettering <lennart@poettering.net>
Wed, 25 Dec 2013 18:00:12 +0000 (19:00 +0100)
committerLennart Poettering <lennart@poettering.net>
Wed, 25 Dec 2013 18:00:38 +0000 (19:00 +0100)
Makefile.am
src/cgtop/cgtop.c
src/core/dbus-cgroup.c
src/core/execute.c

index b7a4681..162a7be 100644 (file)
@@ -5013,4 +5013,4 @@ tests += \
        test-libudev-sym
 
 cppcheck:
-       cppcheck --enable=all $(top_srcdir)
+       cppcheck --enable=all -q $(top_srcdir)
index e5fc262..c56f7a8 100644 (file)
@@ -563,7 +563,7 @@ static int help(void) {
                "  -d --delay=DELAY    Delay between updates\n"
                "  -n --iterations=N   Run for N iterations before exiting\n"
                "  -b --batch          Run in batch mode, accepting no input\n"
-               "     --depth=DEPTH    Maximum traversal depth (default: %d)\n",
+               "     --depth=DEPTH    Maximum traversal depth (default: %u)\n",
                program_invocation_short_name, arg_depth);
 
         return 0;
index 39865a9..861bb16 100644 (file)
@@ -484,6 +484,8 @@ int bus_cgroup_set_property(
 
                         n++;
                 }
+                if (r < 0)
+                        return r;
 
                 if (mode != UNIT_CHECK) {
                         _cleanup_free_ char *buf = NULL;
index 9b33ec0..6ae9a5e 100644 (file)
@@ -1974,7 +1974,7 @@ void exec_context_dump(ExecContext *c, FILE* f, const char *prefix) {
                 fprintf(f, "%sCPUAffinity:", prefix);
                 for (i = 0; i < c->cpuset_ncpus; i++)
                         if (CPU_ISSET_S(i, CPU_ALLOC_SIZE(c->cpuset_ncpus), c->cpuset))
-                                fprintf(f, " %i", i);
+                                fprintf(f, " %u", i);
                 fputs("\n", f);
         }