diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2013-03-31 19:50:30 -0400 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2013-03-31 19:50:30 -0400 |
| commit | 7989e1f2d79891ff73dea0ede1c98c47b62547db (patch) | |
| tree | 136628bc29d3a058ca2ed3ff7c7647e8eee84479 | |
| parent | cc1f918dda4193c7fd2a03de4ab715be67017a36 (diff) | |
Partially revert e62d8c394474
The ~80 chars per line part wasn't well received.
| -rw-r--r-- | src/core/main.c | 16 | ||||
| -rw-r--r-- | src/core/manager.c | 3 | ||||
| -rw-r--r-- | src/readahead/readahead-collect.c | 3 | ||||
| -rw-r--r-- | src/shared/ask-password-api.c | 3 |
4 files changed, 8 insertions, 17 deletions
diff --git a/src/core/main.c b/src/core/main.c index bd7fc468b4..35cd7724c3 100644 --- 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) - 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; @@ -151,15 +150,11 @@ _noreturn_ static void crash(int sig) { /* 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) - log_error("Caught <%s>, core dump failed.", - signal_to_string(sig)); + log_error("Caught <%s>, core dump failed.", signal_to_string(sig)); 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); } - 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."); diff --git a/src/core/manager.c b/src/core/manager.c index 8f4eb0b9c5..2e89f19839 100644 --- a/src/core/manager.c +++ b/src/core/manager.c @@ -1230,8 +1230,7 @@ static int manager_process_notify_fd(Manager *m) { if (!u) { u = cgroup_unit_by_pid(m, ucred->pid); if (!u) { - log_warning("Cannot find unit for notify message of PID %lu.", - (unsigned long) ucred->pid); + log_warning("Cannot find unit for notify message of PID %lu.", (unsigned long) ucred->pid); continue; } } diff --git a/src/readahead/readahead-collect.c b/src/readahead/readahead-collect.c index 643a5a8cea..b2d0f68726 100644 --- a/src/readahead/readahead-collect.c +++ b/src/readahead/readahead-collect.c @@ -291,8 +291,7 @@ static int collect(const char *root) { goto finish; } - fanotify_fd = fanotify_init(FAN_CLOEXEC|FAN_NONBLOCK, - O_RDONLY|O_LARGEFILE|O_CLOEXEC|O_NOATIME); + fanotify_fd = fanotify_init(FAN_CLOEXEC|FAN_NONBLOCK, O_RDONLY|O_LARGEFILE|O_CLOEXEC|O_NOATIME); if (fanotify_fd < 0) { log_error("Failed to create fanotify object: %m"); r = -errno; diff --git a/src/shared/ask-password-api.c b/src/shared/ask-password-api.c index d091a22dea..85530660dc 100644 --- a/src/shared/ask-password-api.c +++ b/src/shared/ask-password-api.c @@ -263,8 +263,7 @@ static int create_socket(char **name) { zero(sa); sa.un.sun_family = AF_UNIX; - snprintf(sa.un.sun_path, sizeof(sa.un.sun_path)-1, - "/run/systemd/ask-password/sck.%llu", random_ull()); + snprintf(sa.un.sun_path, sizeof(sa.un.sun_path)-1, "/run/systemd/ask-password/sck.%llu", random_ull()); u = umask(0177); r = bind(fd, &sa.sa, offsetof(struct sockaddr_un, sun_path) + strlen(sa.un.sun_path)); |