[systemd-commits] 2 commits - src/core src/gpt-auto-generator

[Lennart Poettering]

 src/core/socket.c                           |    8 +-------
 src/gpt-auto-generator/gpt-auto-generator.c |    2 +-
 2 files changed, 2 insertions(+), 8 deletions(-)

New commits:
commit 9c4495ca561624c2f0085507dd1288ed5f1247c5
Author: Tomasz Torcz <tomek at pipebreaker.pl>
Date:   Wed Mar 12 19:25:11 2014 +0100

    gpt-auto-generator: don't return OOM on parentless devices

diff --git a/src/gpt-auto-generator/gpt-auto-generator.c b/src/gpt-auto-generator/gpt-auto-generator.c
index e487f64..19c5eea 100644
--- a/src/gpt-auto-generator/gpt-auto-generator.c
+++ b/src/gpt-auto-generator/gpt-auto-generator.c
@@ -395,7 +395,7 @@ static int enumerate_partitions(dev_t devnum) {
 
         parent = udev_device_get_parent(d);
         if (!parent)
-                return log_oom();
+                return 0;
 
         /* Does it have a devtype? */
         devtype = udev_device_get_devtype(parent);

commit 9d16d0c7d0b05e3ff278c3c95e1f2f871f348dd3
Author: Daniel Buch <boogiewasthere at gmail.com>
Date:   Wed Mar 12 20:09:25 2014 +0100

    socket.c: make use of union sockaddr_union

diff --git a/src/core/socket.c b/src/core/socket.c
index 35531ed..8ecc9f9 100644
--- a/src/core/socket.c
+++ b/src/core/socket.c
@@ -597,13 +597,7 @@ static void socket_dump(Unit *u, FILE *f, const char *prefix) {
 static int instance_from_socket(int fd, unsigned nr, char **instance) {
         socklen_t l;
         char *r;
-        union {
-                struct sockaddr sa;
-                struct sockaddr_un un;
-                struct sockaddr_in in;
-                struct sockaddr_in6 in6;
-                struct sockaddr_storage storage;
-        } local, remote;
+        union sockaddr_union local, remote;
 
         assert(fd >= 0);
         assert(instance);