[systemd-commits] src/core src/shared

[Kay Sievers]

 src/core/dbus-cgroup.c |    6 +++---
 src/shared/time-util.c |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 7759ecb21e2057eacf2dbd111d2f13ea10bff844
Author: Kay Sievers <kay at vrfy.org>
Date:   Mon Oct 21 18:40:33 2013 +0200

    silent a few more gcc warnings

diff --git a/src/core/dbus-cgroup.c b/src/core/dbus-cgroup.c
index 5654b8c..f198357 100644
--- a/src/core/dbus-cgroup.c
+++ b/src/core/dbus-cgroup.c
@@ -238,7 +238,6 @@ int bus_cgroup_set_property(
                         DBusMessageIter sub2;
                         const char *path;
                         uint64_t u64;
-                        CGroupBlockIODeviceBandwidth *a;
 
                         dbus_message_iter_recurse(&sub, &sub2);
                         if (bus_iter_get_basic_and_next(&sub2, DBUS_TYPE_STRING, &path, true) < 0 ||
@@ -246,6 +245,7 @@ int bus_cgroup_set_property(
                                 return -EINVAL;
 
                         if (mode != UNIT_CHECK) {
+                                CGroupBlockIODeviceBandwidth *a = NULL;
                                 CGroupBlockIODeviceBandwidth *b;
                                 bool exist = false;
 
@@ -329,7 +329,6 @@ int bus_cgroup_set_property(
                         const char *path;
                         uint64_t u64;
                         unsigned long ul;
-                        CGroupBlockIODeviceWeight *a;
 
                         dbus_message_iter_recurse(&sub, &sub2);
 
@@ -342,6 +341,7 @@ int bus_cgroup_set_property(
                                 return -EINVAL;
 
                         if (mode != UNIT_CHECK) {
+                                CGroupBlockIODeviceWeight *a = NULL;
                                 CGroupBlockIODeviceWeight *b;
                                 bool exist = false;
 
@@ -465,7 +465,6 @@ int bus_cgroup_set_property(
                 while (dbus_message_iter_get_arg_type(&sub) == DBUS_TYPE_STRUCT) {
                         DBusMessageIter sub2;
                         const char *path, *rwm;
-                        CGroupDeviceAllow *a;
 
                         dbus_message_iter_recurse(&sub, &sub2);
 
@@ -487,6 +486,7 @@ int bus_cgroup_set_property(
                         }
 
                         if (mode != UNIT_CHECK) {
+                                CGroupDeviceAllow *a = NULL;
                                 CGroupDeviceAllow *b;
                                 bool exist = false;
 
diff --git a/src/shared/time-util.c b/src/shared/time-util.c
index 4b4cd7a..7bb7d4e 100644
--- a/src/shared/time-util.c
+++ b/src/shared/time-util.c
@@ -283,7 +283,7 @@ char *format_timespan(char *buf, size_t l, usec_t t, usec_t accuracy) {
         /* The result of this function can be parsed with parse_sec */
 
         for (i = 0; i < ELEMENTSOF(table); i++) {
-                int k;
+                int k = 0;
                 size_t n;
                 bool done = false;
                 usec_t a, b;