Changeset 1438 for code/branches

Timestamp:

May 27, 2008, 4:30:15 AM (17 years ago)

Author:

landauf

Message:

removed some other (potential) bugs or dangerous code lines

Location:

code/branches/console/src

Files:

• audio/AudioStream.cc (modified) (1 diff)
• core/Script.cc (modified) (1 diff)
• core/TclBind.cc (modified) (3 diffs)
• network/GameStateClient.cc (modified) (2 diffs)
• network/PacketDecoder.cc (modified) (2 diffs)
• network/dummyclient3.cc (modified) (1 diff)

code/branches/console/src/audio/AudioStream.cc

@@ -117 +117 @@
 
             for(int i = 0; i < vorbisComment->comments; i++)
+            {
                 COUT(3) << "   " << vorbisComment->user_comments[i] << std::endl;
+            }
 
             COUT(3) << std::endl;

code/branches/console/src/core/Script.cc

@@ -128 +128 @@
     if (error == 0)
       error = lua_pcall(luaState_, 0, 0, 0);
-    if (error != 0) COUT(2) << "Error in Lua-script: " << lua_tostring(luaState_, -1) << std::endl;
+    if (error != 0)
+    {
+      COUT(2) << "Error in Lua-script: " << lua_tostring(luaState_, -1) << std::endl;
+    }
   }
 

code/branches/console/src/core/TclBind.cc

@@ -110 +110 @@
 
         if (!CommandExecutor::execute(command, false))
+        {
             COUT(1) << "Error: Can't execute command \"" << command << "\"!" << std::endl;
+        }
 
         if (CommandExecutor::getLastEvaluation().hasReturnvalue())
@@ -124 +126 @@
 
         if (!CommandExecutor::execute(command, false))
+        {
             COUT(1) << "Error: Can't execute command \"" << command << "\"!" << std::endl;
+        }
     }
 
@@ -133 +137 @@
             std::string output = TclBind::getInstance().interpreter_->eval(tclcode);
             if (output != "")
+            {
                 COUT(0) << "tcl> " << output << std::endl;
+            }
             return output;
         }

code/branches/console/src/network/GameStateClient.cc

@@ -102 +102 @@
           // update data and create object/entity...
           if( !no->updateData(sync) && !no->create() )
+          {
             COUT(1) << "We couldn't create/update the object: " << sync.objectID << std::endl;
+          }
           ++it;
         }
@@ -108 +110 @@
         // we have our object
         if(! it->updateData(sync))
+        {
           COUT(1) << "We couldn't update objectID: " \
           << sync.objectID << "; classID: " << sync.classID << std::endl;
+        }
       }
       ++it;

code/branches/console/src/network/PacketDecoder.cc

@@ -176 +176 @@
     //since data is not allocated, because it's just a pointer, allocate it with size of gamestatedatastream
     if(currentState->compsize==0)
+    {
       COUT(2) << "compsize is 0" << std::endl;
+    }
     currentState->data = (unsigned char*)(malloc( currentState->compsize ));
     if(currentState->data==NULL)
+    {
       COUT(2) << "Gamestatepacket-decoder: memory leak" << std::endl;
+    }
     //copy the GameStateCompressed data
     //std::cout << "packet size (enet): " << packet->dataLength << std::endl;
@@ -252 +256 @@
   {
     if(clientId!=CLIENTID_CLIENT)
+    {
       COUT(5) << "client: " << clientId << std::endl;
+    }
     COUT(5) << "data id: " << data->id << std::endl;
     COUT(5) << "data:    " << data->message << std::endl;

code/branches/console/src/network/dummyclient3.cc

@@ -51 +51 @@
   Client client( str, PORT );
   if ( client.establishConnection() )
+  {
     COUT(3) << "connection established" << std::endl;
-  else COUT(0) << "problems establishing connection" << std::endl;
+  }
+  else
+  {
+    COUT(0) << "problems establishing connection" << std::endl;
+  }
   char message[10000];
   char signs[] = "abcdefghijklmnopqrstuvwxy";