[systemd-commits] 5 commits - TODO configure.ac src/core src/journal src/systemctl

[Lennart Poettering]

 TODO                          |    3 +++
 configure.ac                  |    2 +-
 src/core/unit.c               |    2 +-
 src/journal/journald-server.c |    9 +++++----
 src/systemctl/systemctl.c     |    2 +-
 5 files changed, 11 insertions(+), 7 deletions(-)

New commits:
commit 433dd100442e8197868def975c6fd38b48dc6439
Author: Lukas Nykryn <lnykryn at redhat.com>
Date:   Tue Jul 9 15:45:37 2013 +0200

    journald-server: r should be checked after journal_file_open_reliably

diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
index 44ba916..6beaa8a 100644
--- a/src/journal/journald-server.c
+++ b/src/journal/journald-server.c
@@ -910,11 +910,12 @@ static int system_journal_open(Server *s) {
 
                 if (r >= 0)
                         server_fix_perms(s, s->system_journal, 0);
-        } else if (r < 0) {
-                if (r != -ENOENT && r != -EROFS)
-                        log_warning("Failed to open system journal: %s", strerror(-r));
+                else if (r < 0) {
+                        if (r != -ENOENT && r != -EROFS)
+                                log_warning("Failed to open system journal: %s", strerror(-r));
 
-                r = 0;
+                        r = 0;
+                }
         }
 
         if (!s->runtime_journal &&

commit 47a1454f707dff2e5d1db2f8bfcc406805d4d450
Author: Lennart Poettering <lennart at poettering.net>
Date:   Fri Jul 12 01:18:09 2013 +0200

    update TODO

diff --git a/TODO b/TODO
index b8d0151..5d4ba8f 100644
--- a/TODO
+++ b/TODO
@@ -54,6 +54,9 @@ CGroup Rework Completion:
 
 Features:
 
+* Get rid of systemd-sysv:
+  https://fedoraproject.org/wiki/User:Toshio/Systemd_Convert_draft
+
 * do we really need both hasprefix() and startswith()?
 
 * when a kernel driver logs in a tight loop we should ratelimit that too.

commit cd3069559a09b4e4f85a6f02aa8f0521f48359ca
Author: Lennart Poettering <lennart at poettering.net>
Date:   Fri Jul 12 01:15:52 2013 +0200

    build-sys: don't enable color gcc on dumb terminals
    
    Guys, we know that emacs is the best editor on earth, but unfortunately
    its "M-x compile" terminal cannot do colors (well, it does its own
    highlighting of the output anyway), and it will inform the programs it
    calls about this with TERM=dumb, and gcc should check for that. But you
    guys turned that off. Not cool. Let's turn it on again.

diff --git a/configure.ac b/configure.ac
index 1e196f7..802009e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -133,7 +133,7 @@ CC_CHECK_FLAGS_APPEND([with_cflags], [CFLAGS], [\
         -ffast-math \
         -fno-common \
         -fdiagnostics-show-option \
-        -fdiagnostics-color \
+        -fdiagnostics-color=auto \
         -fno-strict-aliasing \
         -fvisibility=hidden \
         -ffunction-sections \

commit 66a69314941b5020f57cda943095413c40d677d8
Author: Lukas Nykryn <lnykryn at redhat.com>
Date:   Tue Jul 9 15:45:38 2013 +0200

    systemctl: remove unused variable

diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index 2ea5a3b..9574ff2 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -1186,7 +1186,7 @@ static int list_dependencies(DBusConnection *bus, char **args) {
 
 static int get_default(DBusConnection *bus, char **args) {
         char *path = NULL;
-        _cleanup_dbus_message_unref_ DBusMessage *m = NULL, *reply = NULL;
+        _cleanup_dbus_message_unref_ DBusMessage *reply = NULL;
         int r;
         _cleanup_dbus_error_free_ DBusError error;
 

commit f440e1bb8a0b1262c7649da502d0e9358019b968
Author: Lukas Nykryn <lnykryn at redhat.com>
Date:   Tue Jul 9 15:45:36 2013 +0200

    unit: check correct variable after strdup

diff --git a/src/core/unit.c b/src/core/unit.c
index dd08011..b245356 100644
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -2326,7 +2326,7 @@ int unit_deserialize(Unit *u, FILE *f, FDSet *fds) {
                         char *s;
 
                         s = strdup(v);
-                        if (!v)
+                        if (!s)
                                 return -ENOMEM;
 
                         free(u->cgroup_path);