changes matching those of generic.?xx

[flightgear.git] / src / Main / fg_io.cxx

diff --git a/src/Main/fg_io.cxx b/src/Main/fg_io.cxx
index 2288fc538161d9d4f8c6802e364c2968633ae8dc..7d904d6f9b4bb04e1234d2058cd3e5f86eb4ccb7 100644 (file)
--- a/src/Main/fg_io.cxx
+++ b/src/Main/fg_io.cxx
@@ -102,7 +102,6 @@ FGIO::parse_port_config( const string& config )
        return 0;
     }
 
-    unsigned num_tokens = tokens.size();
     string protocol = tokens[0];
     SG_LOG( SG_IO, SG_INFO, "  protocol = " << protocol );
 
@@ -189,22 +188,21 @@ FGIO::parse_port_config( const string& config )
            io = rul;
         } else if ( protocol == "generic" ) {
             int configToken;
-            if (tokens[1] == "socket")
+            if (tokens[1] == "socket") {
                 configToken = 7;
-            else if (tokens[1] == "file")
+            } else if (tokens[1] == "file") {
                 configToken = 5;
-            else
+            } else {
                 configToken = 6;
-            if (configToken < num_tokens)
-            {
-               FGGeneric *generic = new FGGeneric( tokens[configToken] );
-               io = generic;
             }
-            else
-            {
-               SG_LOG( SG_IO, SG_ALERT, "Not enough tokens passed for the generic protocol.");
-               return NULL;
+
+            if (configToken >= tokens.size()) {
+                SG_LOG( SG_IO, SG_ALERT, "Not enough tokens passed for the generic protocol.");
+                return NULL;
             }
+
+            FGGeneric *generic = new FGGeneric( tokens );
+            io = generic;
        } else if ( protocol == "multiplay" ) {
            if ( tokens.size() != 5 ) {
                SG_LOG( SG_IO, SG_ALERT, "Ignoring invalid --multiplay option "