IM port cleanup

server-tools/instance-manager/IMService.cpp

@@ -5,8 +5,8 @@
 
 IMService::IMService(void)
 {
-  serviceName = "MySqlManager";
-  displayName = "MySQL Manager";
+  serviceName= "MySqlManager";
+  displayName= "MySQL Manager";
 }
 
 IMService::~IMService(void)
@@ -69,4 +69,3 @@ int HandleServiceOptions(Options options)
     return (int)winService.Init();
   return ret_val;
 }
-

server-tools/instance-manager/WindowsService.cpp

@@ -155,8 +155,7 @@ void WindowsService::RegisterAndRun(DWORD argc, LPTSTR *argv)
 void WindowsService::HandleControlCode(DWORD opcode)
 {
   // Handle the requested control code.
-  switch(opcode)
-  {
+  switch(opcode) {
   case SERVICE_CONTROL_STOP:
     // Stop the service.
     status.dwCurrentState= SERVICE_STOP_PENDING;
@@ -201,5 +200,3 @@ void WINAPI WindowsService::ControlHandler(DWORD opcode)
 
   return gService->HandleControlCode(opcode);
 }
-
-

server-tools/instance-manager/WindowsService.h

@@ -23,7 +23,7 @@ class WindowsService
   BOOL  Init();
   BOOL  IsInstalled();
   void  SetAcceptedControls(DWORD acceptedControls);
-  void  Debug(bool debugFlag) { debugging = debugFlag; }
+  void  Debug(bool debugFlag) { debugging= debugFlag; }
 
 public:
   static void WINAPI    ServiceMain(DWORD argc, LPTSTR *argv);
@@ -41,4 +41,3 @@ class WindowsService
   void HandleControlCode(DWORD opcode);
   void RegisterAndRun(DWORD argc, LPTSTR *argv);
 };
-

server-tools/instance-manager/instance.cc

@@ -121,8 +121,7 @@ int Instance::launch_and_wait()
 {
   pid_t pid= fork();
 
-  switch (pid)
-  {
+  switch (pid) {
   case 0:
     execv(options.mysqld_path, options.argv);
     /* exec never returns */
@@ -161,7 +160,7 @@ int Instance::launch_and_wait()
   PROCESS_INFORMATION pi;
 
   ZeroMemory(&si, sizeof(si));
-    si.cb = sizeof(si);
+  si.cb= sizeof(si);
   ZeroMemory(&pi, sizeof(pi));
 
   int cmdlen= 0;
@@ -215,8 +214,8 @@ void Instance::fork_and_monitor()
 {
   log_info("starting instance %s", options.instance_name);
 
-  int result= launch_and_wait();
-  if (result == -1) return;
+  if (launch_and_wait())
+    return;                                     /* error is logged */
 
   /* set instance state to crashed */
   pthread_mutex_lock(&LOCK_instance);
@@ -233,9 +232,6 @@ void Instance::fork_and_monitor()
   pthread_cond_signal(&instance_map->guardian->COND_guardian);
   /* thread exits */
   return;
-
-  /* we should never end up here */
-  DBUG_ASSERT(0);
 }
 
 
@@ -268,9 +264,9 @@ bool Instance::is_running()
   MYSQL mysql;
   uint port= 0;
   const char *socket= NULL;
-  const char *password= "check_connection";
-  const char *username= "MySQL_Instance_Manager";
-  const char *access_denied_message= "Access denied for user";
+  static const char *password= "check_connection";
+  static const char *username= "MySQL_Instance_Manager";
+  static const char *access_denied_message= "Access denied for user";
   bool return_val;
 
   if (options.mysqld_port)
@@ -299,15 +295,8 @@ bool Instance::is_running()
     return_val= TRUE;                           /* server is alive */
   }
   else
-  {
-    if (!strncmp(access_denied_message, mysql_error(&mysql),
-                 sizeof(access_denied_message)-1))
-    {
-      return_val= TRUE;
-    }
-    else
-      return_val= FALSE;
-  }
+    return_val= test(!strncmp(access_denied_message, mysql_error(&mysql),
+                              sizeof(access_denied_message) - 1));
 
   mysql_close(&mysql);
   pthread_mutex_unlock(&LOCK_instance);
@@ -370,7 +359,7 @@ int Instance::stop()
 
 BOOL SafeTerminateProcess(HANDLE hProcess, UINT uExitCode)
 {
-  DWORD dwTID, dwCode, dwErr = 0;
+  DWORD dwTID, dwCode, dwErr= 0;
   HANDLE hProcessDup= INVALID_HANDLE_VALUE;
   HANDLE hRT= NULL;
   HINSTANCE hKernel= GetModuleHandle("Kernel32");

server-tools/instance-manager/listener.cc

@@ -150,7 +150,7 @@ void Listener_thread::run()
         /* accept may return -1 (failure or spurious wakeup) */
         if (client_fd >= 0)                    // connection established
         {
-          Vio *vio = vio_new(client_fd, socket_index==0?VIO_TYPE_SOCKET:
+          Vio *vio= vio_new(client_fd, socket_index==0?VIO_TYPE_SOCKET:
                             VIO_TYPE_TCPIP, socket_index==0?1:0);
           if (vio != 0)
             handle_new_mysql_connection(vio);
@@ -236,7 +236,7 @@ int Listener_thread::create_tcp_socket()
   uint im_port= options.port_number;
 
   ip_socket_address.sin_family= AF_INET;
-  ip_socket_address.sin_addr.s_addr = im_bind_addr;
+  ip_socket_address.sin_addr.s_addr= im_bind_addr;
 
 
   ip_socket_address.sin_port= (unsigned short)
@@ -273,8 +273,8 @@ int Listener_thread::create_tcp_socket()
 }
 
 #ifndef __WIN__
-int Listener_thread::create_unix_socket(
-			struct sockaddr_un &unix_socket_address)
+int Listener_thread::create_unix_socket(struct sockaddr_un
+                                        &unix_socket_address)
 {
   int unix_socket= socket(AF_UNIX, SOCK_STREAM, 0);
   if (unix_socket == INVALID_SOCKET)
@@ -322,8 +322,9 @@ int Listener_thread::create_unix_socket(
   /* make sure that instances won't be listening our sockets */
   set_no_inherit(unix_socket);
 
-  log_info("accepting connections on unix socket %s", unix_socket_address.sun_path);
-  sockets[num_sockets++] = unix_socket;
+  log_info("accepting connections on unix socket %s",
+           unix_socket_address.sun_path);
+  sockets[num_sockets++]= unix_socket;
   FD_SET(unix_socket, &read_fds);
   return 0;
 }

server-tools/instance-manager/options.cc

@@ -112,11 +112,12 @@ static struct my_option my_long_options[] =
 
   { "default-mysqld-path", OPT_MYSQLD_PATH, "Where to look for MySQL"
     " Server binary.",
-    (gptr *) &Options::default_mysqld_path, (gptr *) &Options::default_mysqld_path,
+    (gptr *) &Options::default_mysqld_path,
+    (gptr *) &Options::default_mysqld_path,
     0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },
 
-  { "monitoring-interval", OPT_MONITORING_INTERVAL, "Interval to monitor instances"
-                                            " in seconds.",
+  { "monitoring-interval", OPT_MONITORING_INTERVAL, "Interval to monitor"
+    " instances in seconds.",
     (gptr *) &Options::monitoring_interval,
     (gptr *) &Options::monitoring_interval,
     0, GET_UINT, REQUIRED_ARG, DEFAULT_MONITORING_INTERVAL,
@@ -327,9 +328,9 @@ char* change_extension(const char *src, const char *newext)
 
 void Options::setup_windows_defaults(const char *progname)
 {
-  Options::password_file_name= default_password_file_name = 
+  Options::password_file_name= default_password_file_name=
     change_extension(progname, "passwd");
-  Options::log_file_name= default_log_file_name = 
+  Options::log_file_name= default_log_file_name=
     change_extension(progname, "log");
 }
 

server-tools/instance-manager/user_map.cc

@@ -25,6 +25,12 @@
 
 #include "log.h"
 
+#ifdef __WIN__
+#define NEWLINE_LEN 2
+#else
+#define NEWLINE_LEN 1
+#endif
+
 struct User
 {
   char user[USERNAME_LENGTH + 1];
@@ -36,8 +42,7 @@ struct User
 
 int User::init(const char *line)
 {
-  const char *name_begin, *name_end;
-  char *password;
+  const char *name_begin, *name_end, *password;
 
   if (line[0] == '\'' || line[0] == '"')
   {
@@ -45,7 +50,7 @@ int User::init(const char *line)
     name_end= strchr(name_begin, line[0]);
     if (name_end == 0 || name_end[1] != ':')
       goto err;
-    password= (char*)(name_end + 2);
+    password= name_end + 2;
   }
   else
   {
@@ -53,19 +58,14 @@ int User::init(const char *line)
     name_end= strchr(name_begin, ':');
     if (name_end == 0)
       goto err;
-    password= (char*)(name_end + 1);
+    password= name_end + 1;
   }
   user_length= name_end - name_begin;
   if (user_length > USERNAME_LENGTH)
     goto err;
 
   /* assume that newline characater is present */
-  if (password[strlen(password)-2] == '\r')
-  {
-    password[strlen(password)-2]= '\n';
-    password[strlen(password)-1]= 0;
-  }
-  if (strlen(password) != SCRAMBLED_PASSWORD_CHAR_LENGTH + 1)
+  if (strlen(password) != SCRAMBLED_PASSWORD_CHAR_LENGTH + NEWLINE_LEN)
     goto err;
 
   memcpy(user, name_begin, user_length);
@@ -101,7 +101,7 @@ C_MODE_END
 
 int User_map::init()
 {
-  enum { START_HASH_SIZE = 16 };
+  enum { START_HASH_SIZE= 16 };
   if (hash_init(&hash, default_charset_info, START_HASH_SIZE, 0, 0,
       get_user_key, delete_user, 0))
     return 1;