diff options
author | Mattias Andrée <maandree@operamail.com> | 2014-12-09 13:15:10 +0100 |
---|---|---|
committer | Mattias Andrée <maandree@operamail.com> | 2014-12-09 13:15:10 +0100 |
commit | 7a994c9631c590d6a73c842fa5d2d3567b4771dd (patch) | |
tree | 228ade01f99ba217151a0ed20f29c5f3a5028619 /src/mds-respawn.c | |
parent | mds-kbdc: compile-layout: macro_call: fix bug: do not duplicate the arguments if there are none (diff) | |
parent | report an error, rather than causing failure the caller but not for the called function (diff) | |
download | mds-7a994c9631c590d6a73c842fa5d2d3567b4771dd.tar.gz mds-7a994c9631c590d6a73c842fa5d2d3567b4771dd.tar.bz2 mds-7a994c9631c590d6a73c842fa5d2d3567b4771dd.tar.xz |
merge track-errors and resolve conflict
Signed-off-by: Mattias Andrée <maandree@operamail.com>
Diffstat (limited to 'src/mds-respawn.c')
-rw-r--r-- | src/mds-respawn.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/mds-respawn.c b/src/mds-respawn.c index bcbb7fe..b95f40e 100644 --- a/src/mds-respawn.c +++ b/src/mds-respawn.c @@ -157,7 +157,7 @@ int parse_cmdline(void) return 0; - pfail: + fail: xperror(*argv); return 1; } @@ -243,7 +243,7 @@ int preinitialise_server(void) fail_if (xsigaction(SIGUSR2, received_revive) < 0); return 0; - pfail: + fail: xperror(*argv); return 1; } @@ -292,8 +292,7 @@ int postinitialise_server(void) if (commands_args[i] == NULL) j++; else if (strequals(commands_args[i], "--initial-spawn")) - if ((commands_args[i] = strdup("--respawn")) == NULL) - goto pfail; + fail_if ((commands_args[i] = strdup("--respawn")) == NULL); /* Respawn dead and dead and buried servers.*/ @@ -303,7 +302,7 @@ int postinitialise_server(void) spawn_server(i); return 0; - pfail: + fail: xperror(*argv); return 1; } |