misc: whitespace fixes

This commit is contained in:
Austin English 2018-10-12 17:16:23 -05:00 committed by Mike Frysinger
parent 67e2d6033d
commit 02af093043
7 changed files with 8 additions and 8 deletions

View File

@ -126,7 +126,7 @@ Linux_modules()
start() start()
{ {
case "$RC_UNAME" in case "$RC_UNAME" in
FreeBSD|Linux) FreeBSD|Linux)
modules_load_d modules_load_d
${RC_UNAME}_modules ${RC_UNAME}_modules
;; ;;

View File

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

View File

@ -57,7 +57,7 @@ s6_stop()
ebegin "Stopping ${name:-$RC_SVCNAME}" ebegin "Stopping ${name:-$RC_SVCNAME}"
s6-svc -d -wD -T ${s6_service_timeout_stop:-60000} "${s6_service_link}" s6-svc -d -wD -T ${s6_service_timeout_stop:-60000} "${s6_service_link}"
set -- $(s6-svstat "${s6_service_link}") set -- $(s6-svstat "${s6_service_link}")
[ "$1" = "up" ] && [ "$1" = "up" ] &&
yesno "${s6_force_kill:-yes}" && yesno "${s6_force_kill:-yes}" &&
_s6_force_kill "$@" _s6_force_kill "$@"
set -- $(s6-svstat "${s6_service_link}") set -- $(s6-svstat "${s6_service_link}")

View File

@ -38,9 +38,9 @@ ssd_start()
service_inactive && _inactive=true service_inactive && _inactive=true
mark_service_inactive mark_service_inactive
fi fi
[ -n "$output_logger" ] && [ -n "$output_logger" ] &&
output_logger_arg="--stdout-logger \"$output_logger\"" output_logger_arg="--stdout-logger \"$output_logger\""
[ -n "$error_logger" ] && [ -n "$error_logger" ] &&
error_logger_arg="--stderr-logger \"$error_logger\"" error_logger_arg="--stderr-logger \"$error_logger\""
#the eval call is necessary for cases like: #the eval call is necessary for cases like:
# command_args="this \"is a\" test" # command_args="this \"is a\" test"

View File

@ -248,7 +248,7 @@ int main(int argc, char **argv)
usage(EXIT_FAILURE); usage(EXIT_FAILURE);
} }
} }
openlog(applet, LOG_CONS|LOG_PID, LOG_DAEMON); openlog(applet, LOG_CONS|LOG_PID, LOG_DAEMON);
if (mount_proc() != 0) { if (mount_proc() != 0) {
rc_stringlist_free(omits); rc_stringlist_free(omits);

View File

@ -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_name, user, sizeof(utmp.ut_name));
strncpy(utmp.ut_id , id , sizeof(utmp.ut_id )); strncpy(utmp.ut_id , id , sizeof(utmp.ut_id ));
strncpy(utmp.ut_line, line, sizeof(utmp.ut_line)); strncpy(utmp.ut_line, line, sizeof(utmp.ut_line));
/* Put the OS version in place of the hostname */ /* Put the OS version in place of the hostname */
if (uname(&uname_buf) == 0) if (uname(&uname_buf) == 0)
strncpy(utmp.ut_host, uname_buf.release, sizeof(utmp.ut_host)); strncpy(utmp.ut_host, uname_buf.release, sizeof(utmp.ut_host));

View File

@ -835,7 +835,7 @@ int main(int argc, char **argv)
if (respawn_delay * respawn_max > respawn_period) if (respawn_delay * respawn_max > respawn_period)
ewarn("%s: Please increase the value of --respawn-period to more " 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); respawn_delay * respawn_max);
if (retry) { if (retry) {