diff options
author | unknown <reggie@linux.site> | 2005-08-09 07:57:40 -0600 |
---|---|---|
committer | unknown <reggie@linux.site> | 2005-08-09 07:57:40 -0600 |
commit | f766a1dc41e7b72741746a462704dc42562b2b86 (patch) | |
tree | a7fde26b064339dd4ccb6aea6869aa1fdc4caa2a /server-tools/instance-manager/options.cc | |
parent | 7a42570fb739477861e17714c21774591c994f4d (diff) | |
download | mariadb-git-f766a1dc41e7b72741746a462704dc42562b2b86.tar.gz |
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
Diffstat (limited to 'server-tools/instance-manager/options.cc')
-rw-r--r-- | server-tools/instance-manager/options.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/server-tools/instance-manager/options.cc b/server-tools/instance-manager/options.cc index fac399eacb2..6fd11471fc6 100644 --- a/server-tools/instance-manager/options.cc +++ b/server-tools/instance-manager/options.cc @@ -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; |