From 884f83e29d8514f65d40170abb62602e18dd5965 Mon Sep 17 00:00:00 2001
From: Florian Pose <fp@igh.de>
Date: Fri, 25 Jul 2008 08:52:45 +0000
Subject: [PATCH] Moved slaveState() to Command::alStateString().

---
 tool/Command.cpp       | 13 +++++++++++++
 tool/Command.h         |  2 ++
 tool/CommandSlaves.cpp | 17 ++---------------
 tool/CommandSlaves.h   |  2 --
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/tool/Command.cpp b/tool/Command.cpp
index b9f0c5b2..8381e4f9 100644
--- a/tool/Command.cpp
+++ b/tool/Command.cpp
@@ -79,3 +79,16 @@ void Command::throwCommandException(const stringstream &s)
 }
 
 /****************************************************************************/
+
+string Command::alStateString(uint8_t state)
+{
+    switch (state) {
+        case 1: return "INIT";
+        case 2: return "PREOP";
+        case 4: return "SAFEOP";
+        case 8: return "OP";
+        default: return "???";
+    }
+}
+
+/****************************************************************************/
diff --git a/tool/Command.h b/tool/Command.h
index dc362501..0c7770b4 100644
--- a/tool/Command.h
+++ b/tool/Command.h
@@ -83,6 +83,8 @@ class Command
         void throwCommandException(const stringstream &);
 
 		enum {BreakAfterBytes = 16};
+        
+        static string alStateString(uint8_t);
 
     private:
 		string name;
diff --git a/tool/CommandSlaves.cpp b/tool/CommandSlaves.cpp
index 8935948e..5ef5113e 100644
--- a/tool/CommandSlaves.cpp
+++ b/tool/CommandSlaves.cpp
@@ -126,7 +126,7 @@ void CommandSlaves::listSlaves(
             info.relPos = str.str();
             str.str("");
 
-            info.state = slaveState(slave.state);
+            info.state = alStateString(slave.state);
             info.flag = (slave.error_flag ? 'E' : '+');
 
             if (strlen(slave.name)) {
@@ -186,7 +186,7 @@ void CommandSlaves::showSlave(
         cout << "Alias: " << slave.alias << endl;
 
     cout
-        << "State: " << slaveState(slave.state) << endl
+        << "State: " << alStateString(slave.state) << endl
         << "Flag: " << (slave.error_flag ? 'E' : '+') << endl
         << "Identity:" << endl
         << "  Vendor Id:       0x"
@@ -274,17 +274,4 @@ void CommandSlaves::showSlave(
     }
 }
 
-/****************************************************************************/
-
-string CommandSlaves::slaveState(uint8_t state)
-{
-    switch (state) {
-        case 1: return "INIT";
-        case 2: return "PREOP";
-        case 4: return "SAFEOP";
-        case 8: return "OP";
-        default: return "???";
-    }
-}
-
 /*****************************************************************************/
diff --git a/tool/CommandSlaves.h b/tool/CommandSlaves.h
index 1336e465..18c2d892 100644
--- a/tool/CommandSlaves.h
+++ b/tool/CommandSlaves.h
@@ -32,8 +32,6 @@ class CommandSlaves:
 
         void listSlaves(MasterDevice &, int);
         void showSlave(MasterDevice &, uint16_t);
-
-        static string slaveState(uint8_t);
 };
 
 /****************************************************************************/