IM port cleanup

server-tools/instance-manager/IMService.cpp:
  coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/WindowsService.cpp:
  coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/WindowsService.h:
  coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/instance.cc:
  cleanup & coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/listener.cc:
  coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/manager.cc:
  coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/options.cc:
  coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/user_map.cc:
  simplify password file processing

1 files changed, 11 insertions, 11 deletions

diff --git a/server-tools/instance-manager/manager.cc b/server-tools/instance-manager/manager.cc
index e3daca71898..09d30e1312f 100644
--- a/server-tools/instance-manager/manager.cc
+++ b/server-tools/instance-manager/manager.cc
@@ -238,20 +238,20 @@ void manager(const Options &options)
       process_alarm(signo);
     else
 #endif
+    {
+      if (!guardian_thread.is_stopped())
+      {
+        bool stop_instances= true;
+        guardian_thread.request_shutdown(stop_instances);
+        pthread_cond_signal(&guardian_thread.COND_guardian);
+      }
+      else
       {
-        if (!guardian_thread.is_stopped())
-        {
-          bool stop_instances= true;
-          guardian_thread.request_shutdown(stop_instances);
-          pthread_cond_signal(&guardian_thread.COND_guardian);
-        }
-        else
-        {
-          thread_registry.deliver_shutdown();
-          shutdown_complete= TRUE;
-        }
+        thread_registry.deliver_shutdown();
+        shutdown_complete= TRUE;
       }
     }
+  }
 
 err:
   /* delete the pid file */