more review fixes

server-tools/instance-manager/command.cc:
  member rename
server-tools/instance-manager/commands.cc:
  rename
server-tools/instance-manager/commands.h:
  member rename
server-tools/instance-manager/guardian.cc:
  guardian fixed to use Instance_map::Iterator intead of Imap
server-tools/instance-manager/instance_map.cc:
  removed get_instance method from Instance_map as it is needed only by
  Iterator which is made a friend class
server-tools/instance-manager/instance_map.h:
  use Instance_map::Iterator instead if Imap_iterator (no need to add more
  names to the global namespace)

1 files changed, 16 insertions, 19 deletions

diff --git a/server-tools/instance-manager/instance_map.h b/server-tools/instance-manager/instance_map.h
index 193376c6f23..21d8c5caa9f 100644
--- a/server-tools/instance-manager/instance_map.h
+++ b/server-tools/instance-manager/instance_map.h
@@ -38,6 +38,22 @@ extern void free_groups(char **groups);
 
 class Instance_map
 {
+  friend class Iterator;
+public:
+  /* Instance_map iterator */
+  class Iterator
+  {
+  private:
+    uint current_instance;
+    Instance_map *instance_map;
+  public:
+    Iterator(Instance_map *instance_map_arg) :
+      instance_map(instance_map_arg), current_instance(0)
+    {}
+
+    void go_to_first();
+    Instance *next();
+  };
 public:
   /* returns a pointer to the instance or NULL, if there is no such instance */
   Instance *find(const char *name, uint name_len);
@@ -47,7 +63,6 @@ public:
   int cleanup();
   int lock();
   int unlock();
-  Instance *get_instance(uint instance_number);
 
   Instance_map();
   ~Instance_map();
@@ -72,22 +87,4 @@ private:
   HASH hash;
 };
 
-
-/* Instance_map iterator */
-
-class Imap_iterator
-{
-private:
-  uint current_instance;
-  Instance_map *instance_map;
-public:
-  Imap_iterator(Instance_map *instance_map_arg) :
-    instance_map(instance_map_arg), current_instance(0)
-  {}
-
-  void go_to_first();
-  Instance *next();
-};
-
-
 #endif /* INCLUDES_MYSQL_INSTANCE_MANAGER_INSTANCE_MAP_H */