diff options
author | Sebastian Jennen <sebastian.t.jennen@gmail.com> | 2019-02-23 17:26:25 +0100 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2019-04-12 17:26:33 +0200 |
commit | 1ace223ca74032a224950665438311eb688f1e05 (patch) | |
tree | a4db64f2e191d02aa5e00f5f4e83189fae43571b /src/activate/activate.c | |
parent | c52db42b78f6fbeb7792cc4eca27e2767a48b6ca (diff) | |
download | systemd-1ace223ca74032a224950665438311eb688f1e05.tar.gz |
code style format: clang-format applied to src/a*/*
[zj: this is a subset of changes generated by clang-format, just the ones
I think improve readability or consistency.]
This is a part of https://github.com/systemd/systemd/pull/11811.
Diffstat (limited to 'src/activate/activate.c')
-rw-r--r-- | src/activate/activate.c | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/src/activate/activate.c b/src/activate/activate.c index 473366fb20..48aa617e78 100644 --- a/src/activate/activate.c +++ b/src/activate/activate.c @@ -24,11 +24,11 @@ #include "terminal-util.h" #include "util.h" -static char** arg_listen = NULL; +static char **arg_listen = NULL; static bool arg_accept = false; static int arg_socket_type = SOCK_STREAM; -static char** arg_args = NULL; -static char** arg_setenv = NULL; +static char **arg_args = NULL; +static char **arg_setenv = NULL; static char **arg_fdnames = NULL; static bool arg_inetd = false; @@ -86,7 +86,7 @@ static int open_sockets(int *epoll_fd, bool accept) { */ STRV_FOREACH(address, arg_listen) { - fd = make_socket_fd(LOG_DEBUG, *address, arg_socket_type, (arg_accept*SOCK_CLOEXEC)); + fd = make_socket_fd(LOG_DEBUG, *address, arg_socket_type, (arg_accept * SOCK_CLOEXEC)); if (fd < 0) { log_open(); return log_error_errno(fd, "Failed to open '%s': %m", *address); @@ -117,7 +117,7 @@ static int open_sockets(int *epoll_fd, bool accept) { return count; } -static int exec_process(const char* name, char **argv, char **env, int start_fd, size_t n_fds) { +static int exec_process(const char *name, char **argv, char **env, int start_fd, size_t n_fds) { _cleanup_strv_free_ char **envp = NULL; _cleanup_free_ char *joined = NULL; @@ -199,10 +199,10 @@ static int exec_process(const char* name, char **argv, char **env, int start_fd, start_fd = SD_LISTEN_FDS_START; } - if (asprintf((char**)(envp + n_env++), "LISTEN_FDS=%zu", n_fds) < 0) + if (asprintf((char **) (envp + n_env++), "LISTEN_FDS=%zu", n_fds) < 0) return log_oom(); - if (asprintf((char**)(envp + n_env++), "LISTEN_PID=" PID_FMT, getpid_cached()) < 0) + if (asprintf((char **) (envp + n_env++), "LISTEN_PID=" PID_FMT, getpid_cached()) < 0) return log_oom(); if (arg_fdnames) { @@ -244,7 +244,7 @@ static int exec_process(const char* name, char **argv, char **env, int start_fd, return log_error_errno(errno, "Failed to execp %s (%s): %m", name, joined); } -static int fork_and_exec_process(const char* child, char** argv, char **env, int fd) { +static int fork_and_exec_process(const char *child, char **argv, char **env, int fd) { _cleanup_free_ char *joined = NULL; pid_t child_pid; int r; @@ -253,7 +253,9 @@ static int fork_and_exec_process(const char* child, char** argv, char **env, int if (!joined) return log_oom(); - r = safe_fork("(activate)", FORK_RESET_SIGNALS|FORK_DEATHSIG|FORK_RLIMIT_NOFILE_SAFE|FORK_LOG, &child_pid); + r = safe_fork("(activate)", + FORK_RESET_SIGNALS | FORK_DEATHSIG | FORK_RLIMIT_NOFILE_SAFE | FORK_LOG, + &child_pid); if (r < 0) return r; if (r == 0) { @@ -266,7 +268,7 @@ static int fork_and_exec_process(const char* child, char** argv, char **env, int return 0; } -static int do_accept(const char* name, char **argv, char **envp, int fd) { +static int do_accept(const char *name, char **argv, char **envp, int fd) { _cleanup_free_ char *local = NULL, *peer = NULL; _cleanup_close_ int fd_accepted = -1; @@ -294,7 +296,7 @@ static void sigchld_hdl(int sig) { int r; si.si_pid = 0; - r = waitid(P_ALL, 0, &si, WEXITED|WNOHANG); + r = waitid(P_ALL, 0, &si, WEXITED | WNOHANG); if (r < 0) { if (errno != ECHILD) log_error_errno(errno, "Failed to reap children: %m"); @@ -309,7 +311,7 @@ static void sigchld_hdl(int sig) { static int install_chld_handler(void) { static const struct sigaction act = { - .sa_flags = SA_NOCLDSTOP|SA_RESTART, + .sa_flags = SA_NOCLDSTOP | SA_RESTART, .sa_handler = sigchld_hdl, }; @@ -376,7 +378,7 @@ static int parse_argv(int argc, char *argv[]) { assert(argv); while ((c = getopt_long(argc, argv, "+hl:aE:d", options, NULL)) >= 0) - switch(c) { + switch (c) { case 'h': return help(); |