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

3 files changed, 7 insertions, 7 deletions

diff --git a/server-tools/instance-manager/IMService.cpp b/server-tools/instance-manager/IMService.cpp
index 4e53fe15ef4..428667d51fd 100644
--- a/server-tools/instance-manager/IMService.cpp
+++ b/server-tools/instance-manager/IMService.cpp
@@ -66,6 +66,6 @@ int HandleServiceOptions(Options options)
     }
   }
   else
-    ret_val= winService.Init() ? 0 : 1;
+    ret_val= !winService.Init();
   return ret_val;
 }
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;
diff --git a/server-tools/instance-manager/options.h b/server-tools/instance-manager/options.h
index 537316fedfc..5cc14e7ee7f 100644
--- a/server-tools/instance-manager/options.h
+++ b/server-tools/instance-manager/options.h
@@ -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
 };