[systemd-commits] 2 commits - src/machine src/systemctl

[Thomas H.P. Andersen]

 src/machine/machinectl.c  |    2 +-
 src/systemctl/systemctl.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit f69157a66ffe413b4cf8bd79057487fc8921e78b
Author: Thomas Hindoe Paaboel Andersen <phomes at gmail.com>
Date:   Fri Nov 1 20:54:29 2013 +0100

    machinectl: fix warning when compiling with -Og
    
    src/machine/machinectl.c: In function ‘openpt_in_namespace’:
    src/machine/machinectl.c:623:44: warning: ‘master’ may be used uninitialized in this function [-Wmaybe-uninitialized]
                             close_nointr_nofail(master);
                                                ^

diff --git a/src/machine/machinectl.c b/src/machine/machinectl.c
index 7a252c3..5a6bb05 100644
--- a/src/machine/machinectl.c
+++ b/src/machine/machinectl.c
@@ -528,7 +528,7 @@ static int openpt_in_namespace(pid_t pid, int flags) {
                 uint8_t buf[CMSG_SPACE(sizeof(int))];
         } control;
         struct cmsghdr *cmsg;
-        int master, r;
+        int master = -1, r;
         pid_t child;
         siginfo_t si;
 

commit 76fdc9669a639db042d0e8bf57f525f008495535
Author: Thomas Hindoe Paaboel Andersen <phomes at gmail.com>
Date:   Fri Nov 1 20:46:49 2013 +0100

    systemctl: fix typo in help text

diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index 87a6985..9f5e273 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -4741,7 +4741,7 @@ static int systemctl_help(void) {
                "  -f --force          When enabling unit files, override existing symlinks\n"
                "                      When shutting down, execute action immediately\n"
                "     --root=PATH      Enable unit files in the specified root directory\n"
-               "  -n --lines=INTEGER  Numer of journal entries to show\n"
+               "  -n --lines=INTEGER  Number of journal entries to show\n"
                "  -o --output=STRING  Change journal output mode (short, short-monotonic,\n"
                "                      verbose, export, json, json-pretty, json-sse, cat)\n\n"
                "Unit Commands:\n"