[systemd-commits] 2 commits - src/cgtop src/shared

Lennart Poettering lennart at kemper.freedesktop.org
Fri Mar 29 07:47:26 PDT 2013


 src/cgtop/cgtop.c      |    4 ++--
 src/shared/utmp-wtmp.c |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit f04c0bd6ed2632f2e91c725388fd2f70859bfde5
Author: Lennart Poettering <lennart at poettering.net>
Date:   Fri Mar 29 15:47:18 2013 +0100

    utmp: make gcc shut up, we need to pass an int here, not size_t

diff --git a/src/shared/utmp-wtmp.c b/src/shared/utmp-wtmp.c
index 8717dba..0a01809 100644
--- a/src/shared/utmp-wtmp.c
+++ b/src/shared/utmp-wtmp.c
@@ -408,7 +408,7 @@ int utmp_wall(const char *message, bool (*match_tty)(const char *tty)) {
                         path = u->ut_line;
                 else {
                         if (asprintf(&buf, "/dev/%.*s",
-                                     sizeof(u->ut_line), u->ut_line) < 0) {
+                                     (int) sizeof(u->ut_line), u->ut_line) < 0) {
                                 r = -ENOMEM;
                                 goto finish;
                         }

commit 813ac7d3dded660486e3b22b27929d78328e3ab3
Author: Maksim Melnikau <maxposedon at gmail.com>
Date:   Fri Mar 29 15:55:50 2013 +0300

    cgtop --help: default depth is 3 not 2
    
    use default depth from variable for --help

diff --git a/src/cgtop/cgtop.c b/src/cgtop/cgtop.c
index f80d51e..eebebf0 100644
--- a/src/cgtop/cgtop.c
+++ b/src/cgtop/cgtop.c
@@ -522,8 +522,8 @@ static void help(void) {
                "  -d --delay=DELAY    Specify delay\n"
                "  -n --iterations=N   Run for N iterations before exiting\n"
                "  -b --batch          Run in batch mode, accepting no input\n"
-               "     --depth=DEPTH    Maximum traversal depth (default: 2)\n",
-               program_invocation_short_name);
+               "     --depth=DEPTH    Maximum traversal depth (default: %d)\n",
+               program_invocation_short_name, arg_depth);
 }
 
 static void version(void) {



More information about the systemd-commits mailing list