1 |
commit: 02af093043a7444381b0d8a0a3e8e97247505f95 |
2 |
Author: Austin English <austinenglish <AT> gmail <DOT> com> |
3 |
AuthorDate: Fri Oct 12 22:16:23 2018 +0000 |
4 |
Commit: William Hubbs <williamh <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Oct 13 16:53:54 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/openrc.git/commit/?id=02af0930 |
7 |
|
8 |
misc: whitespace fixes |
9 |
|
10 |
init.d/modules.in | 2 +- |
11 |
sh/rc-cgroup.sh.in | 2 +- |
12 |
sh/s6.sh | 2 +- |
13 |
sh/start-stop-daemon.sh | 4 ++-- |
14 |
src/rc/kill_all.c | 2 +- |
15 |
src/rc/rc-wtmp.c | 2 +- |
16 |
src/rc/supervise-daemon.c | 2 +- |
17 |
7 files changed, 8 insertions(+), 8 deletions(-) |
18 |
|
19 |
diff --git a/init.d/modules.in b/init.d/modules.in |
20 |
index 08abae3d..998972ba 100644 |
21 |
--- a/init.d/modules.in |
22 |
+++ b/init.d/modules.in |
23 |
@@ -126,7 +126,7 @@ Linux_modules() |
24 |
start() |
25 |
{ |
26 |
case "$RC_UNAME" in |
27 |
- FreeBSD|Linux) |
28 |
+ FreeBSD|Linux) |
29 |
modules_load_d |
30 |
${RC_UNAME}_modules |
31 |
;; |
32 |
|
33 |
diff --git a/sh/rc-cgroup.sh.in b/sh/rc-cgroup.sh.in |
34 |
index d4b68ada..79ada43f 100644 |
35 |
--- a/sh/rc-cgroup.sh.in |
36 |
+++ b/sh/rc-cgroup.sh.in |
37 |
@@ -62,7 +62,7 @@ cgroup_set_values() |
38 |
while [ -n "$1" ] && [ "$controller" != "cpuacct" ]; do |
39 |
case "$1" in |
40 |
$controller.*) |
41 |
- if [ -n "${name}" ] && [ -w "${cgroup}/${name}" ] && |
42 |
+ if [ -n "${name}" ] && [ -w "${cgroup}/${name}" ] && |
43 |
[ -n "${val}" ]; then |
44 |
veinfo "$RC_SVCNAME: Setting $cgroup/$name to $val" |
45 |
printf "%s" "$val" > "$cgroup/$name" |
46 |
|
47 |
diff --git a/sh/s6.sh b/sh/s6.sh |
48 |
index 33c478ad..acbe965b 100644 |
49 |
--- a/sh/s6.sh |
50 |
+++ b/sh/s6.sh |
51 |
@@ -57,7 +57,7 @@ s6_stop() |
52 |
ebegin "Stopping ${name:-$RC_SVCNAME}" |
53 |
s6-svc -d -wD -T ${s6_service_timeout_stop:-60000} "${s6_service_link}" |
54 |
set -- $(s6-svstat "${s6_service_link}") |
55 |
- [ "$1" = "up" ] && |
56 |
+ [ "$1" = "up" ] && |
57 |
yesno "${s6_force_kill:-yes}" && |
58 |
_s6_force_kill "$@" |
59 |
set -- $(s6-svstat "${s6_service_link}") |
60 |
|
61 |
diff --git a/sh/start-stop-daemon.sh b/sh/start-stop-daemon.sh |
62 |
index e68b47ef..2e549ae1 100644 |
63 |
--- a/sh/start-stop-daemon.sh |
64 |
+++ b/sh/start-stop-daemon.sh |
65 |
@@ -38,9 +38,9 @@ ssd_start() |
66 |
service_inactive && _inactive=true |
67 |
mark_service_inactive |
68 |
fi |
69 |
- [ -n "$output_logger" ] && |
70 |
+ [ -n "$output_logger" ] && |
71 |
output_logger_arg="--stdout-logger \"$output_logger\"" |
72 |
- [ -n "$error_logger" ] && |
73 |
+ [ -n "$error_logger" ] && |
74 |
error_logger_arg="--stderr-logger \"$error_logger\"" |
75 |
#the eval call is necessary for cases like: |
76 |
# command_args="this \"is a\" test" |
77 |
|
78 |
diff --git a/src/rc/kill_all.c b/src/rc/kill_all.c |
79 |
index 3aeaa262..0833e5f8 100644 |
80 |
--- a/src/rc/kill_all.c |
81 |
+++ b/src/rc/kill_all.c |
82 |
@@ -248,7 +248,7 @@ int main(int argc, char **argv) |
83 |
usage(EXIT_FAILURE); |
84 |
} |
85 |
} |
86 |
- |
87 |
+ |
88 |
openlog(applet, LOG_CONS|LOG_PID, LOG_DAEMON); |
89 |
if (mount_proc() != 0) { |
90 |
rc_stringlist_free(omits); |
91 |
|
92 |
diff --git a/src/rc/rc-wtmp.c b/src/rc/rc-wtmp.c |
93 |
index 8d494303..40cc280c 100644 |
94 |
--- a/src/rc/rc-wtmp.c |
95 |
+++ b/src/rc/rc-wtmp.c |
96 |
@@ -42,7 +42,7 @@ void log_wtmp(const char *user, const char *id, pid_t pid, int type, |
97 |
strncpy(utmp.ut_name, user, sizeof(utmp.ut_name)); |
98 |
strncpy(utmp.ut_id , id , sizeof(utmp.ut_id )); |
99 |
strncpy(utmp.ut_line, line, sizeof(utmp.ut_line)); |
100 |
- |
101 |
+ |
102 |
/* Put the OS version in place of the hostname */ |
103 |
if (uname(&uname_buf) == 0) |
104 |
strncpy(utmp.ut_host, uname_buf.release, sizeof(utmp.ut_host)); |
105 |
|
106 |
diff --git a/src/rc/supervise-daemon.c b/src/rc/supervise-daemon.c |
107 |
index 24cc56fa..4e3d22c4 100644 |
108 |
--- a/src/rc/supervise-daemon.c |
109 |
+++ b/src/rc/supervise-daemon.c |
110 |
@@ -835,7 +835,7 @@ int main(int argc, char **argv) |
111 |
|
112 |
if (respawn_delay * respawn_max > respawn_period) |
113 |
ewarn("%s: Please increase the value of --respawn-period to more " |
114 |
- "than %d to avoid infinite respawning", applet, |
115 |
+ "than %d to avoid infinite respawning", applet, |
116 |
respawn_delay * respawn_max); |
117 |
|
118 |
if (retry) { |