summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJason St. John <jstjohn@purdue.edu>2013-07-02 13:24:48 +0200
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2013-07-02 23:06:22 -0400
commite9c1ea9de87d4d508ac38ce87a2fa56e7529a91a (patch)
tree9c2c2a0455a74f6639c98c42a136888bd99474ef /src
parente79f68d11dcf4f7470fe21c219009c81e6433cf9 (diff)
replace tabs with spaces in various files
The affected files in this patch had inconsistent use of tabs vs. spaces for indentation, and this patch eliminates the stray tabs. Also, the opening brace of sigchld_hdl() in activate.c was moved so the opening braces are consistent throughout the file.
Diffstat (limited to 'src')
-rw-r--r--src/activate/activate.c9
-rw-r--r--src/core/execute.c6
-rw-r--r--src/shared/missing.h2
-rw-r--r--src/systemctl/systemctl.c2
4 files changed, 9 insertions, 10 deletions
diff --git a/src/activate/activate.c b/src/activate/activate.c
index 87526d47cc..83d25b13af 100644
--- a/src/activate/activate.c
+++ b/src/activate/activate.c
@@ -290,16 +290,15 @@ static int do_accept(const char* name, char **argv, char **envp, int fd) {
}
/* SIGCHLD handler. */
-static void sigchld_hdl(int sig, siginfo_t *t, void *data)
-{
+static void sigchld_hdl(int sig, siginfo_t *t, void *data) {
log_info("Child %d died with code %d", t->si_pid, t->si_status);
- /* Wait for a dead child. */
- waitpid(t->si_pid, NULL, 0);
+ /* Wait for a dead child. */
+ waitpid(t->si_pid, NULL, 0);
}
static int install_chld_handler(void) {
int r;
- struct sigaction act;
+ struct sigaction act;
zero(act);
act.sa_flags = SA_SIGINFO;
act.sa_sigaction = sigchld_hdl;
diff --git a/src/core/execute.c b/src/core/execute.c
index 5e342f8d47..cbeb0caf26 100644
--- a/src/core/execute.c
+++ b/src/core/execute.c
@@ -1727,10 +1727,10 @@ int exec_context_load_environment(const ExecContext *c, char ***l) {
strv_free(r);
return k;
- }
+ }
/* Log invalid environment variables with filename */
- if (p)
- p = strv_env_clean_log(p, pglob.gl_pathv[n]);
+ if (p)
+ p = strv_env_clean_log(p, pglob.gl_pathv[n]);
if (r == NULL)
r = p;
diff --git a/src/shared/missing.h b/src/shared/missing.h
index 96e6d63101..24a8392b22 100644
--- a/src/shared/missing.h
+++ b/src/shared/missing.h
@@ -139,7 +139,7 @@ static inline int fanotify_init(unsigned int flags, unsigned int event_f_flags)
static inline int fanotify_mark(int fanotify_fd, unsigned int flags, uint64_t mask,
int dfd, const char *pathname) {
#if defined _MIPS_SIM && _MIPS_SIM == _MIPS_SIM_ABI32 || defined __powerpc__ && !defined __powerpc64__ \
- || defined __arm__ && !defined __aarch64__
+ || defined __arm__ && !defined __aarch64__
union {
uint64_t _64;
uint32_t _32[2];
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index 7ecd8d2cfb..7436d4e875 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -3444,7 +3444,7 @@ static int show_one(const char *verb, DBusConnection *bus, const char *path, boo
r = 1;
else
r = 3;
- }
+ }
while ((p = info.exec)) {
LIST_REMOVE(ExecStatusInfo, exec, info.exec, p);