chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
man: make bootup graph consistent
[elogind.git]
/
src
/
activate
/
activate.c
diff --git
a/src/activate/activate.c
b/src/activate/activate.c
index 909ea24cc0f93fb2e6ea9293b376b38cc4ccacf7..2689934c409356274cab242ebcf3c79878e44d24 100644
(file)
--- a/
src/activate/activate.c
+++ b/
src/activate/activate.c
@@
-51,10
+51,8
@@
static int add_epoll(int epoll_fd, int fd) {
ev.data.fd = fd;
r = epoll_ctl(epoll_fd, EPOLL_CTL_ADD, fd, &ev);
ev.data.fd = fd;
r = epoll_ctl(epoll_fd, EPOLL_CTL_ADD, fd, &ev);
- if (r < 0) {
- log_error("Failed to add event on epoll fd:%d for fd:%d: %m", epoll_fd, fd);
- return -errno;
- }
+ if (r < 0)
+ return log_error_errno(errno, "Failed to add event on epoll fd:%d for fd:%d: %m", epoll_fd, fd);
return 0;
}
return 0;
}
@@
-111,10
+109,8
@@
static int open_sockets(int *epoll_fd, bool accept) {
log_open();
*epoll_fd = epoll_create1(EPOLL_CLOEXEC);
log_open();
*epoll_fd = epoll_create1(EPOLL_CLOEXEC);
- if (*epoll_fd < 0) {
- log_error("Failed to create epoll object: %m");
- return -errno;
- }
+ if (*epoll_fd < 0)
+ return log_error_errno(errno, "Failed to create epoll object: %m");
for (fd = SD_LISTEN_FDS_START; fd < SD_LISTEN_FDS_START + count; fd++) {
_cleanup_free_ char *name = NULL;
for (fd = SD_LISTEN_FDS_START; fd < SD_LISTEN_FDS_START + count; fd++) {
_cleanup_free_ char *name = NULL;
@@
-175,7
+171,7
@@
static int launch(char* name, char **argv, char **env, int fds) {
log_info("Execing %s (%s)", name, tmp);
execvpe(name, argv, envp);
log_info("Execing %s (%s)", name, tmp);
execvpe(name, argv, envp);
- log_error
(
"Failed to execp %s (%s): %m", name, tmp);
+ log_error
_errno(errno,
"Failed to execp %s (%s): %m", name, tmp);
return -errno;
}
return -errno;
}
@@
-192,28
+188,26
@@
static int launch1(const char* child, char** argv, char **env, int fd) {
parent_pid = getpid();
child_pid = fork();
parent_pid = getpid();
child_pid = fork();
- if (child_pid < 0) {
- log_error("Failed to fork: %m");
- return -errno;
- }
+ if (child_pid < 0)
+ return log_error_errno(errno, "Failed to fork: %m");
/* In the child */
if (child_pid == 0) {
r = dup2(fd, STDIN_FILENO);
if (r < 0) {
/* In the child */
if (child_pid == 0) {
r = dup2(fd, STDIN_FILENO);
if (r < 0) {
- log_error
(
"Failed to dup connection to stdin: %m");
+ log_error
_errno(errno,
"Failed to dup connection to stdin: %m");
_exit(EXIT_FAILURE);
}
r = dup2(fd, STDOUT_FILENO);
if (r < 0) {
_exit(EXIT_FAILURE);
}
r = dup2(fd, STDOUT_FILENO);
if (r < 0) {
- log_error
(
"Failed to dup connection to stdout: %m");
+ log_error
_errno(errno,
"Failed to dup connection to stdout: %m");
_exit(EXIT_FAILURE);
}
r = close(fd);
if (r < 0) {
_exit(EXIT_FAILURE);
}
r = close(fd);
if (r < 0) {
- log_error
(
"Failed to close dupped connection: %m");
+ log_error
_errno(errno,
"Failed to close dupped connection: %m");
_exit(EXIT_FAILURE);
}
_exit(EXIT_FAILURE);
}
@@
-227,7
+221,7
@@
static int launch1(const char* child, char** argv, char **env, int fd) {
_exit(EXIT_SUCCESS);
execvp(child, argv);
_exit(EXIT_SUCCESS);
execvp(child, argv);
- log_error
(
"Failed to exec child %s: %m", child);
+ log_error
_errno(errno,
"Failed to exec child %s: %m", child);
_exit(EXIT_FAILURE);
}
_exit(EXIT_FAILURE);
}
@@
-242,7
+236,7
@@
static int do_accept(const char* name, char **argv, char **envp, int fd) {
fd2 = accept(fd, NULL, NULL);
if (fd2 < 0) {
fd2 = accept(fd, NULL, NULL);
if (fd2 < 0) {
- log_error
(
"Failed to accept connection on fd:%d: %m", fd);
+ log_error
_errno(errno,
"Failed to accept connection on fd:%d: %m", fd);
return fd2;
}
return fd2;
}
@@
-271,7
+265,7
@@
static int install_chld_handler(void) {
r = sigaction(SIGCHLD, &act, 0);
if (r < 0)
r = sigaction(SIGCHLD, &act, 0);
if (r < 0)
- log_error
(
"Failed to install SIGCHLD handler: %m");
+ log_error
_errno(errno,
"Failed to install SIGCHLD handler: %m");
return r;
}
return r;
}
@@
-389,7
+383,7
@@
int main(int argc, char **argv, char **envp) {
if (errno == EINTR)
continue;
if (errno == EINTR)
continue;
- log_error
(
"epoll_wait() failed: %m");
+ log_error
_errno(errno,
"epoll_wait() failed: %m");
return EXIT_FAILURE;
}
return EXIT_FAILURE;
}