shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-10-30 23:21:08 +03:00
Code

Partially revert e62d8c3944

Browse Source 
The ~80 chars per line part wasn't well received.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2013-03-31 19:50:30 -04:00
parent cc1f918dda
commit 7989e1f2d7
4 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/core/main.c
View File

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

3
src/core/manager.c
View File

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

3
src/readahead/readahead-collect.c
View File

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

3
src/shared/ask-password-api.c
View File

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