diff options
| author | Lennart Poettering <lennart@poettering.net> | 2014-08-21 16:15:49 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2014-08-21 17:24:21 +0200 |
| commit | 4c94096027f21d4ed0efe991534a926d39d52369 (patch) | |
| tree | 5e148edac536bc86ef4817f6ea986591c19e8096 | |
| parent | 5ed1227238724959f020169f5332086439709b55 (diff) | |
core: unify how we generate the prefix string when dumping unit state
| -rw-r--r-- | src/core/execute.c | 19 | ||||
| -rw-r--r-- | src/core/service.c | 6 | ||||
| -rw-r--r-- | src/core/socket.c | 1 | ||||
| -rw-r--r-- | src/core/unit.c | 7 |
4 files changed, 11 insertions, 22 deletions
diff --git a/src/core/execute.c b/src/core/execute.c index d8452a666c..2544a2470c 100644 --- a/src/core/execute.c +++ b/src/core/execute.c @@ -2398,12 +2398,11 @@ void exec_status_dump(ExecStatus *s, FILE *f, const char *prefix) { assert(s); assert(f); - if (!prefix) - prefix = ""; - if (s->pid <= 0) return; + prefix = strempty(prefix); + fprintf(f, "%sPID: "PID_FMT"\n", prefix, s->pid); @@ -2463,21 +2462,16 @@ char *exec_command_line(char **argv) { } void exec_command_dump(ExecCommand *c, FILE *f, const char *prefix) { - _cleanup_free_ char *p2 = NULL; - const char *prefix2; - _cleanup_free_ char *cmd = NULL; + const char *prefix2; assert(c); assert(f); - if (!prefix) - prefix = ""; - p2 = strappend(prefix, "\t"); - prefix2 = p2 ? p2 : prefix; + prefix = strempty(prefix); + prefix2 = strappenda(prefix, "\t"); cmd = exec_command_line(c->argv); - fprintf(f, "%sCommand Line: %s\n", prefix, cmd ? cmd : strerror(ENOMEM)); @@ -2488,8 +2482,7 @@ void exec_command_dump(ExecCommand *c, FILE *f, const char *prefix) { void exec_command_dump_list(ExecCommand *c, FILE *f, const char *prefix) { assert(f); - if (!prefix) - prefix = ""; + prefix = strempty(prefix); LIST_FOREACH(command, c, c) exec_command_dump(c, f, prefix); diff --git a/src/core/service.c b/src/core/service.c index 6a4665a1ae..887b1c8514 100644 --- a/src/core/service.c +++ b/src/core/service.c @@ -463,16 +463,14 @@ static int service_load(Unit *u) { } static void service_dump(Unit *u, FILE *f, const char *prefix) { - ServiceExecCommand c; Service *s = SERVICE(u); const char *prefix2; - _cleanup_free_ char *p2 = NULL; assert(s); - p2 = strappend(prefix, "\t"); - prefix2 = p2 ? p2 : prefix; + prefix = strempty(prefix); + prefix2 = strappenda(prefix, "\t"); fprintf(f, "%sService State: %s\n" diff --git a/src/core/socket.c b/src/core/socket.c index 1189f451d2..7ca8edbda8 100644 --- a/src/core/socket.c +++ b/src/core/socket.c @@ -471,6 +471,7 @@ static void socket_dump(Unit *u, FILE *f, const char *prefix) { assert(s); assert(f); + prefix = strempty(prefix); prefix2 = strappenda(prefix, "\t"); fprintf(f, diff --git a/src/core/unit.c b/src/core/unit.c index 08e74b4160..56102b360d 100644 --- a/src/core/unit.c +++ b/src/core/unit.c @@ -791,7 +791,6 @@ void unit_dump(Unit *u, FILE *f, const char *prefix) { char *t, **j; UnitDependency d; Iterator i; - _cleanup_free_ char *p2 = NULL; const char *prefix2; char timestamp1[FORMAT_TIMESTAMP_MAX], @@ -806,10 +805,8 @@ void unit_dump(Unit *u, FILE *f, const char *prefix) { assert(u); assert(u->type >= 0); - if (!prefix) - prefix = ""; - p2 = strappend(prefix, "\t"); - prefix2 = p2 ? p2 : prefix; + prefix = strempty(prefix); + prefix2 = strappenda(prefix, "\t"); fprintf(f, "%s-> Unit %s:\n" |