Changeset 13984 for trunk

Timestamp:

05/30/12 16:16:27 (12 years ago)

Author:

tbretz

Message:

Cleaned main function.

File:

• trunk/FACT++/src/ratecontrol.cc (modified) (1 diff)

trunk/FACT++/src/ratecontrol.cc

@@ -607 +607 @@
         return -1;
 
-    //try
-    {
-        // No console access at all
-        if (!conf.Has("console"))
-        {
-//            if (conf.Get<bool>("no-dim"))
-//                return RunShell<LocalStream, StateMachine, ConnectionFSC>(conf);
-//            else
-                return RunShell<LocalStream>(conf);
-        }
-        // Cosole access w/ and w/o Dim
-/*        if (conf.Get<bool>("no-dim"))
-        {
-            if (conf.Get<int>("console")==0)
-                return RunShell<LocalShell, StateMachine, ConnectionFSC>(conf);
-            else
-                return RunShell<LocalConsole, StateMachine, ConnectionFSC>(conf);
-        }
-        else
-*/        {
-            if (conf.Get<int>("console")==0)
-                return RunShell<LocalShell>(conf);
-            else
-                return RunShell<LocalConsole>(conf);
-        }
-    }
-    /*catch (std::exception& e)
-    {
-        cerr << "Exception: " << e.what() << endl;
-        return -1;
-    }*/
+    if (!conf.Has("console"))
+        return RunShell<LocalStream>(conf);
+
+    if (conf.Get<int>("console")==0)
+        return RunShell<LocalShell>(conf);
+    else
+        return RunShell<LocalConsole>(conf);
 
     return 0;