chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
stdio-bridge: rework stdio bridge to use libsystemd-bus
[elogind.git]
/
src
/
core
/
main.c
diff --git
a/src/core/main.c
b/src/core/main.c
index bd7fc468b4109921dbfa3b3b41b143d11004ef72..35cd7724c30d926276538aebea07a4b079e1f515 100644
(file)
--- a/
src/core/main.c
+++ b/
src/core/main.c
@@
-118,8
+118,7
@@
_noreturn_ static void crash(int sig) {
pid = fork();
if (pid < 0)
pid = fork();
if (pid < 0)
- log_error("Caught <%s>, cannot fork for core dump: %s",
- signal_to_string(sig), strerror(errno));
+ log_error("Caught <%s>, cannot fork for core dump: %s", signal_to_string(sig), strerror(errno));
else if (pid == 0) {
struct rlimit rl;
else if (pid == 0) {
struct rlimit rl;
@@
-151,15
+150,11
@@
_noreturn_ static void crash(int sig) {
/* Order things nicely. */
r = wait_for_terminate(pid, &status);
if (r < 0)
/* Order things nicely. */
r = wait_for_terminate(pid, &status);
if (r < 0)
- log_error("Caught <%s>, waitpid() failed: %s",
- signal_to_string(sig), strerror(-r));
+ log_error("Caught <%s>, waitpid() failed: %s", signal_to_string(sig), strerror(-r));
else if (status.si_code != CLD_DUMPED)
else if (status.si_code != CLD_DUMPED)
- log_error("Caught <%s>, core dump failed.",
- signal_to_string(sig));
+ log_error("Caught <%s>, core dump failed.", signal_to_string(sig));
else
else
- log_error("Caught <%s>, dumped core as pid %lu.",
- signal_to_string(sig),
- (unsigned long) pid);
+ log_error("Caught <%s>, dumped core as pid %lu.", signal_to_string(sig), (unsigned long) pid);
}
}
}
}
@@
-190,8
+185,7
@@
_noreturn_ static void crash(int sig) {
_exit(1);
}
_exit(1);
}
- log_info("Successfully spawned crash shell as pid %lu.",
- (unsigned long) pid);
+ log_info("Successfully spawned crash shell as pid %lu.", (unsigned long) pid);
}
log_info("Freezing execution.");
}
log_info("Freezing execution.");