Commit f766a1dc authored by unknown's avatar unknown
Browse files

changes to IM code that came from Petr's review 


server-tools/instance-manager/IMService.cpp:
  syntax change requested by Petr
server-tools/instance-manager/options.cc:
  return 1 instead of -1
server-tools/instance-manager/options.h:
  changed return value of setup_windows_defaults to int from void
parent 7a42570f

server-tools/instance-manager/IMService.cpp

+1 −1
Original line number Diff line number Diff line
@@ -66,6 +66,6 @@ int HandleServiceOptions(Options options) 
    }

  }

  else

    ret_val= winService.Init() ? 0 : 1;

    ret_val= !winService.Init();

  return ret_val;

}

server-tools/instance-manager/options.cc

+5 −5
Original line number Diff line number Diff line
@@ -291,23 +291,23 @@ void Options::cleanup() 


#ifdef __WIN__



void Options::setup_windows_defaults()

int Options::setup_windows_defaults()

{

  if (!GetModuleFileName(NULL, default_password_file_name,

                         sizeof(default_password_file_name)))

    return -1;

    return 1;

  char *filename= strstr(default_password_file_name, ".exe");

  strcpy(filename, ".passwd");

 

  if (!GetModuleFileName(NULL, default_log_file_name,

                         sizeof(default_log_file_name)))

    return -1;

    return 1;

  filename= strstr(default_log_file_name, ".exe");

  strcpy(filename, ".log");



  if (!GetModuleFileName(NULL, windows_config_file,

                         sizeof(windows_config_file)))

    return -1;

    return 1;

  char *slash= strrchr(windows_config_file, '\\');

  strcpy(slash, "\\my.ini");

  return 0;

server-tools/instance-manager/options.h

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ struct Options 
  int load(int argc, char **argv);

  void cleanup();

#ifdef __WIN__

  void setup_windows_defaults(const char *progname);

  int setup_windows_defaults(const char *progname);

#endif

};