Merge pull request #1426 from poettering/log-syntax

logging fixes and more
2015-10-01 09:46:09 +02:00
parent 8abf529156 5c22925a57
commit 47c67a5042
44 changed files with 560 additions and 662 deletions
@@ -643,7 +643,8 @@ static void socket_dump(Unit *u, FILE *f, const char *prefix) {
                        int r;
                        char *k = NULL;

-                        if ((r = socket_address_print(&p->address, &k)) < 0)
+                        r = socket_address_print(&p->address, &k);
+                        if (r < 0)
                                t = strerror(-r);
                        else
                                t = k;