service: change CheckServiceStatus() return type to VOID

CheckServiceStatus() return value is never used - the status
is set to global options_t struct.

While on it, remove unneccessary "false" argument
and reformat the code.

Signed-off-by: Lev Stipakov <lev@openvpn.net>

main.c

@@ -487,7 +487,7 @@ HandleCopyDataMessage(const COPYDATASTRUCT *copy_data)
 static void CALLBACK
 ManagePersistent(HWND hwnd, UINT UNUSED msg, UINT_PTR id, DWORD UNUSED now)
 {
-    CheckServiceStatus(false);
+    CheckServiceStatus();
     if (o.service_state == service_connected)
     {
         for (int i = 0; i < o.num_configs; i++)

service.c

@@ -89,64 +89,60 @@ out:
     return ret;
 }
 
-int CheckServiceStatus()
+VOID CheckServiceStatus()
 {
+    SC_HANDLE schSCManager = NULL;
+    SC_HANDLE schService = NULL;
+    SERVICE_STATUS ssStatus;
+
+    // Open a handle to the SC Manager database.
+    schSCManager = OpenSCManager(
+        NULL,                    // local machine
+        NULL,                    // ServicesActive database
+        SC_MANAGER_CONNECT);     // Connect rights
 
-  SC_HANDLE schSCManager = NULL;
-  SC_HANDLE schService = NULL;
-  SERVICE_STATUS ssStatus; 
-  BOOL ret = false;
-
-    // Open a handle to the SC Manager database. 
-    schSCManager = OpenSCManager( 
-      NULL,                    // local machine 
-      NULL,                    // ServicesActive database 
-      SC_MANAGER_CONNECT);     // Connect rights 
-   
     if (NULL == schSCManager) {
-      o.service_state = service_noaccess;
+        o.service_state = service_noaccess;
-      goto out;
+        goto out;
     }
 
-    schService = OpenService( 
+    schService = OpenService(
-      schSCManager,          // SCM database 
+        schSCManager,          // SCM database
-      _T("OpenVPNService"),  // service name
+        _T("OpenVPNService"),  // service name
-      SERVICE_QUERY_STATUS); 
+        SERVICE_QUERY_STATUS);
- 
+
     if (schService == NULL) {
-      o.service_state = service_noaccess;
+        o.service_state = service_noaccess;
-      goto out;
+        goto out;
     }
 
-    if (!QueryServiceStatus( 
+    if (!QueryServiceStatus(
-            schService,   // handle to service 
+            schService,   // handle to service
             &ssStatus) )  // address of status information structure
     {
-      /* query failed */
+        /* query failed */
-      o.service_state = service_noaccess;
+        o.service_state = service_noaccess;
-      MsgToEventLog(EVENTLOG_ERROR_TYPE, LoadLocalizedString(IDS_ERR_QUERY_SERVICE));
+        MsgToEventLog(EVENTLOG_ERROR_TYPE, LoadLocalizedString(IDS_ERR_QUERY_SERVICE));
-      goto out;
+        goto out;
     }
- 
+
-    if (ssStatus.dwCurrentState == SERVICE_RUNNING) 
+    if (ssStatus.dwCurrentState == SERVICE_RUNNING)
     {
         o.service_state = service_connected;
-        ret = true;
         goto out;
     }
-    else 
+    else
-    { 
+    {
         o.service_state = service_disconnected;
         goto out;
-    } 
+    }
 
 out:
     if (schService)
         CloseServiceHandle(schService);
     if (schSCManager)
         CloseServiceHandle(schSCManager);
-    return ret;
+}
-} 
 
 /* Attempt to start OpenVPN Automatc Service */
 void StartAutomaticService(void)

service.h

@@ -19,7 +19,7 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-int CheckServiceStatus();
+VOID CheckServiceStatus();
 BOOL CheckIServiceStatus(BOOL warn);
 /* Attempt to start OpenVPN Automatc Service */
 void StartAutomaticService(void);