[systemd-commits] 2 commits - src/libsystemd-bus src/libudev

[Zbigniew Jędrzejewski-Szmek]

 src/libsystemd-bus/sd-bus.c  |    4 ----
 src/libudev/libudev-device.c |   10 ++++------
 2 files changed, 4 insertions(+), 10 deletions(-)

New commits:
commit 572ce4f7832ffa7a91a582c4098f18cec5662666
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date:   Sat Nov 30 20:27:54 2013 -0500

    docs: remove unneeded the's in gudev docs
    
    https://bugs.freedesktop.org/show_bug.cgi?id=72164

diff --git a/src/libudev/libudev-device.c b/src/libudev/libudev-device.c
index 059a590..9558ac3 100644
--- a/src/libudev/libudev-device.c
+++ b/src/libudev/libudev-device.c
@@ -982,9 +982,8 @@ static struct udev_device *device_new_from_parent(struct udev_device *udev_devic
  * Find the next parent device, and fill in information from the sys
  * device and the udev database entry.
  *
- * The returned the device is not referenced. It is attached to the
- * child device, and will be cleaned up when the child device
- * is cleaned up.
+ * Returned device is not referenced. It is attached to the child
+ * device, and will be cleaned up when the child device is cleaned up.
  *
  * It is not necessarily just the upper level directory, empty or not
  * recognized sys directories are ignored.
@@ -1018,9 +1017,8 @@ _public_ struct udev_device *udev_device_get_parent(struct udev_device *udev_dev
  * If devtype is #NULL, only subsystem is checked, and any devtype will
  * match.
  *
- * The returned the device is not referenced. It is attached to the
- * child device, and will be cleaned up when the child device
- * is cleaned up.
+ * Returned device is not referenced. It is attached to the child
+ * device, and will be cleaned up when the child device is cleaned up.
  *
  * It can be called as many times as needed, without caring about
  * references.

commit 75be4e6445793853047414900e0aa1eca16a84bf
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date:   Sat Nov 30 20:10:18 2013 -0500

    bus: remove unused variable

diff --git a/src/libsystemd-bus/sd-bus.c b/src/libsystemd-bus/sd-bus.c
index 1244ec2..1ed08c0 100644
--- a/src/libsystemd-bus/sd-bus.c
+++ b/src/libsystemd-bus/sd-bus.c
@@ -1284,8 +1284,6 @@ int bus_seal_synthetic_message(sd_bus *b, sd_bus_message *m) {
 }
 
 static int bus_write_message(sd_bus *bus, sd_bus_message *message, size_t *idx) {
-        int r;
-
         assert(bus);
         assert(message);
 
@@ -1293,8 +1291,6 @@ static int bus_write_message(sd_bus *bus, sd_bus_message *message, size_t *idx)
                 return bus_kernel_write_message(bus, message);
         else
                 return bus_socket_write_message(bus, message, idx);
-
-        return r;
 }
 
 static int dispatch_wqueue(sd_bus *bus) {