SOURCES: amavisd-new.init - use FUNCTIONS

[glen]

Author: glen                         Date: Fri Apr 13 11:51:17 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- use FUNCTIONS

---- Files affected:
SOURCES:
   amavisd-new.init (1.14 -> 1.15) 

---- Diffs:

================================================================
Index: SOURCES/amavisd-new.init
diff -u SOURCES/amavisd-new.init:1.14 SOURCES/amavisd-new.init:1.15
--- SOURCES/amavisd-new.init:1.14	Sun Sep 17 18:17:31 2006
+++ SOURCES/amavisd-new.init	Fri Apr 13 13:51:12 2007
@@ -17,29 +17,37 @@
 # Get service config
 [ -f /etc/sysconfig/amavisd ] && . /etc/sysconfig/amavisd
 
-RETVAL=0
-# See how we were called.
-case "$1" in
-  start)
+start() {
 	# Check if the service is already running?
 	if [ ! -f /var/lock/subsys/amavisd ]; then
 		msg_starting Amavisd
-		LC_ALL='' LANG='' LC_TYPE='' LC_CTYPE='' daemon $SERVICE_RUN_NICE_LEVEL /usr/sbin/amavisd -c /etc/amavisd.conf
+		LC_ALL= LANG= LC_TYPE= LC_CTYPE= daemon $SERVICE_RUN_NICE_LEVEL /usr/sbin/amavisd -c /etc/amavisd.conf
 		RETVAL=$?
 		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/amavisd
 	else
 		msg_already_running Amavisd
 	fi
+}
+
+stop() {
+	# Stop daemons.
+	if [ -f /var/lock/subsys/amavisd ]; then
+		msg_stopping Amavisd
+		killproc --pidfile amavisd/amavisd.pid amavisd
+		rm -f /var/lock/subsys/amavisd >/dev/null 2>&1
+	else
+		msg_not_running Amavisd
+	fi
+}
+
+RETVAL=0
+# See how we were called.
+case "$1" in
+  start)
+  	start
 	;;
   stop)
-        # Stop daemons.
-        if [ -f /var/lock/subsys/amavisd ]; then
-                msg_stopping Amavisd
-		killproc --pidfile amavisd/amavisd.pid amavisd
-                rm -f /var/lock/subsys/amavisd >/dev/null 2>&1
-        else
-                msg_not_running Amavisd
-        fi
+  	stop
 	;;
   status)
 	status amavisd
@@ -59,9 +67,8 @@
 	fi
 	;;
   restart|force-restart)
-	$0 stop
-	$0 start
-	exit $?
+	stop
+	start
 	;;
   *)
 	msg_usage "$0 {start|stop|restart|force-restart|reload|force-reload|status}"
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/amavisd-new.init?r1=1.14&r2=1.15&f=u