diff options
| author |   ajacoutot <ajacoutot@openbsd.org> | 2014-08-25 19:01:26 +0000 |
|---|---|---|
| committer | ajacoutot <ajacoutot@openbsd.org> | 2014-08-25 19:01:26 +0000 |
| commit | f0c428bcc1cfecf9f91719162b78c1841e654784 (patch) | |
| tree | 7b8bad817e74c0674cfb5855ad751189d94f1a31 | |
| parent | Cope with some weird rc.conf.local file like "foobar" in pkg_scripts (diff) | |
| download | wireguard-openbsd-f0c428bcc1cfecf9f91719162b78c1841e654784.tar.xz wireguard-openbsd-f0c428bcc1cfecf9f91719162b78c1841e654784.zip | |
For functions that take args, return immediately if no args is passed.
Add/drop missing/unused local variables.
no functionnal change
| -rw-r--r-- | usr.sbin/rcctl/rcctl.sh | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/usr.sbin/rcctl/rcctl.sh b/usr.sbin/rcctl/rcctl.sh index fd037936eaf..8c58a01bd33 100644 --- a/usr.sbin/rcctl/rcctl.sh +++ b/usr.sbin/rcctl/rcctl.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# $OpenBSD: rcctl.sh,v 1.23 2014/08/25 18:50:22 ajacoutot Exp $ +# $OpenBSD: rcctl.sh,v 1.24 2014/08/25 19:01:26 ajacoutot Exp $ # # Copyright (c) 2014 Antoine Jacoutot <ajacoutot@openbsd.org> # @@ -59,9 +59,9 @@ rcconf_edit_end() svc_default_enabled() { - local _ret=1 local _svc=$1 [ -n "${_svc}" ] || return + local _ret=1 _rc_parse_conf /etc/rc.conf svc_is_enabled ${_svc} && _ret=0 @@ -72,9 +72,9 @@ svc_default_enabled() svc_default_enabled_flags() { - local _tmp=$(mktemp -t rcctl-deflags.XXXXXXXXXX) || exit 1 local _svc=$1 [ -n "${_svc}" ] || return + local _tmp=$(mktemp -t rcctl-deflags.XXXXXXXXXX) || exit 1 echo "pkg_scripts=${_svc}" >${_tmp} echo "${_svc}_flags=" >>${_tmp} @@ -86,9 +86,9 @@ svc_default_enabled_flags() svc_get_flags() { - local daemon_flags local _svc=$1 [ -n "${_svc}" ] || return + local daemon_flags if svc_is_special ${_svc}; then echo "$(eval echo \${${_svc}})" @@ -109,7 +109,7 @@ svc_get_flags() svc_get_status() { - local _affix _svc=$1 + local _i _svc=$1 if [ -n "${_svc}" ]; then svc_get_flags ${_svc} @@ -144,7 +144,6 @@ svc_is_base() svc_is_enabled() { - local _flags _i local _svc=$1 [ -n "${_svc}" ] || return @@ -192,9 +191,9 @@ rm_from_pkg_scripts() add_flags() { - local _deflags _flags _numargs=$# local _svc=$2 [ -n "${_svc}" ] || return + local _deflags _flags _numargs=$# _deflags="$(svc_default_enabled_flags ${_svc})" |