database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

changes to IM code that came from Petr's review

Browse Source 
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
This commit is contained in:
unknown
2005-08-09 07:57:40 -06:00
parent 7a42570fb7
commit f766a1dc41
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server-tools/instance-manager/IMService.cpp
View File

@@ -66,6 +66,6 @@ int HandleServiceOptions(Options options)
} }
} }
else else
ret_val= winService.Init() ? 0 : 1; ret_val= !winService.Init();
return ret_val; return ret_val;
} }

8
server-tools/instance-manager/options.cc
View File

@@ -291,23 +291,23 @@ void Options::cleanup()
#ifdef __WIN__ #ifdef __WIN__
void Options::setup_windows_defaults() int Options::setup_windows_defaults()
{ {
if (!GetModuleFileName(NULL, default_password_file_name, if (!GetModuleFileName(NULL, default_password_file_name,
sizeof(default_password_file_name))) sizeof(default_password_file_name)))
return -1; return 1;
char *filename= strstr(default_password_file_name, ".exe"); char *filename= strstr(default_password_file_name, ".exe");
strcpy(filename, ".passwd"); strcpy(filename, ".passwd");
if (!GetModuleFileName(NULL, default_log_file_name, if (!GetModuleFileName(NULL, default_log_file_name,
sizeof(default_log_file_name))) sizeof(default_log_file_name)))
return -1; return 1;
filename= strstr(default_log_file_name, ".exe"); filename= strstr(default_log_file_name, ".exe");
strcpy(filename, ".log"); strcpy(filename, ".log");
if (!GetModuleFileName(NULL, windows_config_file, if (!GetModuleFileName(NULL, windows_config_file,
sizeof(windows_config_file))) sizeof(windows_config_file)))
return -1; return 1;
char *slash= strrchr(windows_config_file, '\\'); char *slash= strrchr(windows_config_file, '\\');
strcpy(slash, "\\my.ini"); strcpy(slash, "\\my.ini");
return 0; return 0;

2
server-tools/instance-manager/options.h
View File

@@ -52,7 +52,7 @@ struct Options
int load(int argc, char **argv); int load(int argc, char **argv);
void cleanup(); void cleanup();
#ifdef __WIN__ #ifdef __WIN__
void setup_windows_defaults(const char *progname); int setup_windows_defaults(const char *progname);
#endif #endif
}; };