Changeset 215

Timestamp:

03/26/09 13:32:34 (15 years ago)

Author:

bhilburn

Message:

Doesn't make sense to have returns after ERROR calls since ERROR exits
the program anyways.

Files:

• vtcross/trunk/src/shell/CognitiveRadioShell.cpp (modified) (2 diffs)

vtcross/trunk/src/shell/CognitiveRadioShell.cpp

@@ -221 +221 @@
     TiXmlDocument doc( radioConfig );
     bool loadOkay = doc.LoadFile();
-    if(!loadOkay) {
+    if(!loadOkay)
         ERROR(1,"Loading radio configuration failed: %s\n", radioConfig);
-        return -1;
-    }
 
     TiXmlHandle hDoc(&doc);
@@ -428 +426 @@
     int32_t maxDescriptor = servSock[command];
 
-    if(InitializeTCPServerPort(servSock[primary]) == -1) {
-    ERROR(1,"Error initializing primary port\n");
-           return; 
-    }
+    if(InitializeTCPServerPort(servSock[primary]) == -1)
+        ERROR(1,"Error initializing primary port\n");
  
-    if(InitializeTCPServerPort(servSock[policy]) == -1) {
-    ERROR(1,"Error initializing policy port\n");
-           return; 
-    }
-
-    if(InitializeTCPServerPort(servSock[command]) == -1) { 
-    ERROR(1,"Error initializing command port\n");
-           return; 
-    }
+    if(InitializeTCPServerPort(servSock[policy]) == -1)
+        ERROR(1,"Error initializing policy port\n");
+
+    if(InitializeTCPServerPort(servSock[command]) == -1)
+        ERROR(1,"Error initializing command port\n");
 
     while (running) {