picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

core: unify how we generate the prefix string when dumping unit state

Browse source
This commit is contained in:
Lennart Poettering 2014-08-21 16:15:49 +02:00
parent 5ed1227238
commit 4c94096027
4 changed files with 11 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/core/execute.c
View file

@ -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);

6
src/core/service.c
View file

@ -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"

1
src/core/socket.c
View file

@ -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,

7
src/core/unit.c
View file

@ -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"