[gentoo-commits] proj/openrc:master commit in: src/rc/, init.d/, sh/

[gentoo-commits] proj/openrc:master commit in: src/rc/, init.d/, sh/

[William Hubbs]

commit:     02af093043a7444381b0d8a0a3e8e97247505f95
Author:     Austin English <austinenglish <AT> gmail <DOT> com>
AuthorDate: Fri Oct 12 22:16:23 2018 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sat Oct 13 16:53:54 2018 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=02af0930

misc: whitespace fixes

 init.d/modules.in         | 2 +-
 sh/rc-cgroup.sh.in        | 2 +-
 sh/s6.sh                  | 2 +-
 sh/start-stop-daemon.sh   | 4 ++--
 src/rc/kill_all.c         | 2 +-
 src/rc/rc-wtmp.c          | 2 +-
 src/rc/supervise-daemon.c | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/init.d/modules.in b/init.d/modules.in
index 08abae3d..998972ba 100644
--- a/init.d/modules.in
+++ b/init.d/modules.in
@@ -126,7 +126,7 @@ Linux_modules()
 start()
 {
 	case "$RC_UNAME" in
-		FreeBSD|Linux) 
+		FreeBSD|Linux)
 			modules_load_d
 			${RC_UNAME}_modules
 			;;

diff --git a/sh/rc-cgroup.sh.in b/sh/rc-cgroup.sh.in
index d4b68ada..79ada43f 100644
--- a/sh/rc-cgroup.sh.in
+++ b/sh/rc-cgroup.sh.in
@@ -62,7 +62,7 @@ cgroup_set_values()
 	while [ -n "$1" ] && [ "$controller" != "cpuacct" ]; do
 		case "$1" in
 			$controller.*)
-				if [ -n "${name}" ] && [ -w "${cgroup}/${name}" ] && 
+				if [ -n "${name}" ] && [ -w "${cgroup}/${name}" ] &&
 					[ -n "${val}" ]; then
 					veinfo "$RC_SVCNAME: Setting $cgroup/$name to $val"
 					printf "%s" "$val" > "$cgroup/$name"

diff --git a/sh/s6.sh b/sh/s6.sh
index 33c478ad..acbe965b 100644
--- a/sh/s6.sh
+++ b/sh/s6.sh
@@ -57,7 +57,7 @@ s6_stop()
 	ebegin "Stopping ${name:-$RC_SVCNAME}"
 	s6-svc -d -wD -T ${s6_service_timeout_stop:-60000} "${s6_service_link}"
 	set -- $(s6-svstat "${s6_service_link}")
-	[ "$1" = "up" ] && 
+	[ "$1" = "up" ] &&
 		yesno "${s6_force_kill:-yes}" &&
 			_s6_force_kill "$@"
 	set -- $(s6-svstat "${s6_service_link}")

diff --git a/sh/start-stop-daemon.sh b/sh/start-stop-daemon.sh
index e68b47ef..2e549ae1 100644
--- a/sh/start-stop-daemon.sh
+++ b/sh/start-stop-daemon.sh
@@ -38,9 +38,9 @@ ssd_start()
 		service_inactive && _inactive=true
 		mark_service_inactive
 	fi
-	[ -n "$output_logger" ] && 
+	[ -n "$output_logger" ] &&
 		output_logger_arg="--stdout-logger \"$output_logger\""
-	[ -n "$error_logger" ] && 
+	[ -n "$error_logger" ] &&
 		error_logger_arg="--stderr-logger \"$error_logger\""
 	#the eval call is necessary for cases like:
 	# command_args="this \"is a\" test"

diff --git a/src/rc/kill_all.c b/src/rc/kill_all.c
index 3aeaa262..0833e5f8 100644
--- a/src/rc/kill_all.c
+++ b/src/rc/kill_all.c
@@ -248,7 +248,7 @@ int main(int argc, char **argv)
 		usage(EXIT_FAILURE);
 	}
 	}
-	
+
 	openlog(applet, LOG_CONS|LOG_PID, LOG_DAEMON);
 	if (mount_proc() != 0) {
 		rc_stringlist_free(omits);

diff --git a/src/rc/rc-wtmp.c b/src/rc/rc-wtmp.c
index 8d494303..40cc280c 100644
--- a/src/rc/rc-wtmp.c
+++ b/src/rc/rc-wtmp.c
@@ -42,7 +42,7 @@ void log_wtmp(const char *user, const char *id, pid_t pid, int type,
 	strncpy(utmp.ut_name, user, sizeof(utmp.ut_name));
 	strncpy(utmp.ut_id  , id  , sizeof(utmp.ut_id  ));
 	strncpy(utmp.ut_line, line, sizeof(utmp.ut_line));
-        
+
         /* Put the OS version in place of the hostname */
         if (uname(&uname_buf) == 0)
 		strncpy(utmp.ut_host, uname_buf.release, sizeof(utmp.ut_host));

diff --git a/src/rc/supervise-daemon.c b/src/rc/supervise-daemon.c
index 24cc56fa..4e3d22c4 100644
--- a/src/rc/supervise-daemon.c
+++ b/src/rc/supervise-daemon.c
@@ -835,7 +835,7 @@ int main(int argc, char **argv)
 
 		if (respawn_delay * respawn_max > respawn_period)
 			ewarn("%s: Please increase the value of --respawn-period to more "
-				"than %d to avoid infinite respawning", applet, 
+				"than %d to avoid infinite respawning", applet,
 				respawn_delay * respawn_max);
 
 		if (retry) {