From aa19f4b1db01ffce458b272bd75f5a2c1eb9a902 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Tue, 17 May 2016 20:53:18 +0200
Subject: [PATCH] services: refactor return values

Suggested by: @fabianfrz
---
 src/etc/inc/services.inc | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/etc/inc/services.inc b/src/etc/inc/services.inc
index 3702cc496..bd0241593 100644
--- a/src/etc/inc/services.inc
+++ b/src/etc/inc/services.inc
@@ -2937,8 +2937,6 @@ function is_radvd_enabled() {
 
 function service_control_start($name, $extras)
 {
-    $msg = sprintf(gettext('%s has been started.'), htmlspecialchars($name));
-
     if (!empty($extras['id'])) {
         $filter['id'] = $extras['id'];
     }
@@ -2947,6 +2945,7 @@ function service_control_start($name, $extras)
     if (!isset($service['name'])) {
         return sprintf(gettext("Could not start unknown service `%s'"), htmlspecialchars($name));
     }
+
     if (isset($service['configd']['start'])) {
         foreach ($service['configd']['start'] as $cmd) {
             configd_run($cmd);
@@ -2966,15 +2965,14 @@ function service_control_start($name, $extras)
             mwexec($cmd);
         }
     } else {
-        $msg = sprintf(gettext("Could not start service `%s'"), htmlspecialchars($name));
+        return sprintf(gettext("Could not start service `%s'"), htmlspecialchars($name));
     }
 
-    return $msg;
+    return sprintf(gettext('%s has been started.'), htmlspecialchars($name));
 }
 
 function service_control_stop($name, $extras)
 {
-    $msg = sprintf(gettext("%s has been stopped."), htmlspecialchars($name));
     $filter = array();
 
     if (!empty($extras['id'])) {
@@ -3005,13 +3003,11 @@ function service_control_stop($name, $extras)
         killbyname($service['name']);
     }
 
-    return $msg;
+    return sprintf(gettext("%s has been stopped."), htmlspecialchars($name));
 }
 
 function service_control_restart($name, $extras)
 {
-    $msg = sprintf(gettext("%s has been restarted."), htmlspecialchars($name));
-
     if (!empty($extras['id'])) {
         $filter['id'] = $extras['id'];
     }
@@ -3040,8 +3036,8 @@ function service_control_restart($name, $extras)
             mwexec($cmd);
         }
     } else {
-        $msg = sprintf(gettext("Could not restart service `%s'"), htmlspecialchars($name));
+        return sprintf(gettext("Could not restart service `%s'"), htmlspecialchars($name));
     }
 
-    return $msg;
+    return sprintf(gettext("%s has been restarted."), htmlspecialchars($name));
 }