From bcc6bf710281528744dd40b3c6e4349480a721a3 Mon Sep 17 00:00:00 2001
From: ajacoutot <>
Date: Sat, 7 Jul 2012 10:28:07 +0000
Subject: [PATCH] Simplify rc_wait() (no functionnal change).

initially from robert at peichaer dot org with some enhancement by halex@
ok halex@
---
 src/etc/rc.d/rc.subr | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/etc/rc.d/rc.subr b/src/etc/rc.d/rc.subr
index 11f2be35..33b2d783 100644
--- a/src/etc/rc.d/rc.subr
+++ b/src/etc/rc.d/rc.subr
@@ -1,4 +1,4 @@
-#	$OpenBSD: rc.subr,v 1.57 2012/05/30 08:19:14 espie Exp $
+#	$OpenBSD: rc.subr,v 1.58 2012/07/07 10:28:07 ajacoutot Exp $
 #
 # Copyright (c) 2010, 2011 Antoine Jacoutot <ajacoutot@openbsd.org>
 # Copyright (c) 2010, 2011 Ingo Schwarze <schwarze@openbsd.org>
@@ -74,9 +74,8 @@ rc_exit() {
 }
 
 rc_wait() {
-	i=0
-	[ -n "$2" ] && w=$2 || w=30
-	while [ $i -lt $w ]; do
+	local _i=0 _w=${2:-30}
+	while [ $_i -lt $_w ]; do
 		case "$1" in
 			reload|start)
 				rc_do rc_check && return 0
@@ -89,7 +88,7 @@ rc_wait() {
 				;;
 		esac
 		sleep 1
-		i=$((i+1))
+		_i=$((_i+1))
 	done
 	return 1
 }