Fixed compile warnings.

Author: [email protected]

sockets/CFunctions.cpp

@@ -36,13 +36,15 @@ int CFunctions::sockOpen(lua_State* luaVM)
             // Put the host in a string, and the port in an unsigned short
             string strHost        = lua_tostring ( luaVM, 1 );
             unsigned short usPort = static_cast < unsigned short > ( lua_tonumber ( luaVM, 2 ) );
-            //bool bListen          = ( ( lua_type ( luaVM, 3 ) == LUA_TBOOLEAN ) ? lua_toboolean ( luaVM, 3 ) : false );
+            //bool bListen          = ( ( lua_type ( luaVM, 3 ) == LUA_TBOOLEAN ) ? lua_toboolean ( luaVM, 3 ) == 1 : false );
 
             // Create the socket
             CSocket* pSocket = new CSocket(luaVM, strHost, usPort);
             void* pUserdata  = pSocket->GetUserdata();
             int iError       = pSocket->GetLastSocketError ( );
 
+            //printf ( "Socket returned (error) code: %d\n", iError );
+
             // The socket has got a userdata value if successfully created. It doesn't otherwise
             if ( pUserdata == NULL /*|| pSocket->IsConnected () == false*/ )
             {

sockets/CSocket.cpp

@@ -84,6 +84,8 @@ bool CSocket::DoPulse()
             FD_SET(m_pSocket, &wfds);
             // See if socket it writable
             int ret = select(m_pSocket+1, NULL, &wfds, NULL, &tv);
+            //printf ( "select(...) returned: %d\n", ret );
+
             if (ret == 0)
                return true;     // Not writable yet
             if (ret == -1)
@@ -96,6 +98,7 @@ bool CSocket::DoPulse()
 
         // Receive the data
         int iLength = recv(m_pSocket, chBuffer, SOCK_RECV_LIMIT, 0);
+        // printf ( "Bytes received: %d\n", iLenght );
 
         // Check if there were any errors
         int iError = GetLastSocketError();
@@ -123,12 +126,8 @@ bool CSocket::DoPulse()
             }
         }
     }
-    else
-        // If the socket doesn't exist, well, error?
-        return false;
 
-    // If the call makes it up till here, it has been a huge success! Cake and true as a reward!
-    return true;
+    return false;
 }
 
 bool CSocket::IsConnected()
@@ -221,13 +220,11 @@ int CSocket::HandleConnection(const int& iError)
     {
         return 0;
     }
-    else
-    {
+
 #ifdef _DEBUG
-        printf ( "Could not connect due to error: %i\n", iError ); // TEMP DEBUG
+    printf ( "Could not connect due to error: %i\n", iError ); // TEMP DEBUG
 #endif
-        return ERR_CONNECT_FAILURE;
-    }
+    return ERR_CONNECT_FAILURE;
 }
 
 void CSocket::TriggerEvent(const string eventName, const string arg1)

sockets/CSocketManager.cpp

@@ -40,7 +40,7 @@ bool CSocketManager::SocketLimitExceeded ( void )
     return false;
 }
 
-bool CSocketManager::SocketAdd(CSocket*& pSocket, bool bListen )
+bool CSocketManager::SocketAdd ( CSocket*& pSocket, bool bListen )
 {
     // Add the socket to the loop stuff
     sSocketsStorage* pSocketStorage = new sSocketsStorage ( pSocket, bListen );
@@ -49,7 +49,7 @@ bool CSocketManager::SocketAdd(CSocket*& pSocket, bool bListen )
     return true;
 }
 
-bool CSocketManager::SocketRemove(CSocket*& pSocket)
+bool CSocketManager::SocketRemove ( CSocket*& pSocket )
 {
     // Check if an socket was actually specified
     if ( pSocket == NULL )
@@ -71,7 +71,7 @@ bool CSocketManager::SocketRemove(CSocket*& pSocket)
     return false;
 }
 
-bool CSocketManager::GetSocket(CSocket*& pSocket, void* pUserdata)
+bool CSocketManager::GetSocket ( CSocket*& pSocket, void* pUserdata )
 {
     // Make sure a value has been passed. Don't bother if there hasn't been
     if (pUserdata == NULL)
@@ -92,7 +92,7 @@ bool CSocketManager::GetSocket(CSocket*& pSocket, void* pUserdata)
     return false;
 }
 
-void CSocketManager::HandleStop()
+void CSocketManager::HandleStop ( void )
 {
     // Triggered at module stop. Simply destroys all sockets
     for (unsigned int i = 0; i < vecSockets.size(); ++i)

sockets/CSocketManager.h

@@ -33,14 +33,12 @@ struct sSocketsStorage
 class CSocketManager
 {
 public:
-    static void DoPulse     ();
-    
-    static bool SocketLimitExceeded   ( void );
-    static bool SocketAdd   ( CSocket*& pSocket, bool bListen = false );
-    static bool SocketRemove( CSocket*& pSocket );
-    static bool GetSocket   ( CSocket*& pSocket, void* pUserdata );
-
-    static void HandleStop  ();
+    static void DoPulse                 ( void );
+    static bool SocketLimitExceeded     ( void );
+    static bool SocketAdd               ( CSocket*& pSocket, bool bListen = false );
+    static bool SocketRemove            ( CSocket*& pSocket );
+    static bool GetSocket               ( CSocket*& pSocket, void* pUserdata );
+    static void HandleStop              ( void );
 };
 
 #endif

sockets/extra/CLuaArguments.cpp

@@ -17,6 +17,7 @@
 *********************************************************/
 
 #include "CLuaArguments.h"
+#include "../ml_sockets.h"
 #include <assert.h>
 
 CLuaArguments::CLuaArguments ( const CLuaArguments& Arguments )
@@ -99,13 +100,43 @@ bool CLuaArguments::Call ( lua_State* luaVM, const char* szFunction ) const
     // Push our arguments onto the stack
     PushArguments ( luaVM );
 
-    int iret = lua_pcall ( luaVM, m_Arguments.size (), 0, 0 ) ;
-    if ( iret == LUA_ERRRUN || iret == LUA_ERRMEM )
-    {
-        //const char* szRes = lua_tostring( luaVM, -1 );
-        return false; // the function call failed
-    }
-        
+    // Call the function.
+    int iret = lua_pcall ( luaVM, m_Arguments.size (), LUA_MULTRET, 0 );
+    if ( iret == LUA_ERRRUN || iret == LUA_ERRMEM )
+    {
+        //const char* szRes = lua_tostring ( luaVM, -1 );
+        return false; // The function call failed.
+    }
+    
+    // Get the function return values.
+    while ( lua_gettop ( luaVM ) )
+    {
+        switch ( lua_type ( luaVM, lua_gettop ( luaVM ) ) )
+        {
+            case LUA_TNUMBER:
+                //lua_tonumber ( luaVM, lua_gettop ( luaVM ) );
+                break;
+
+            case LUA_TTABLE:
+                // TODO
+                break;
+
+            case LUA_TSTRING:
+                //lua_tostring ( luaVM, lua_gettop ( luaVM ) );
+                break;
+
+            case LUA_TBOOLEAN:
+                //lua_toboolean ( luaVM, lua_gettop ( luaVM ) );
+                break;
+
+            default:
+                // TODO
+                break;
+        }
+
+        lua_pop ( luaVM, 1 );
+    }
+
     return true;
 }
 

sockets/ml_sockets.cpp

@@ -26,8 +26,8 @@ MTAEXPORT bool InitModule ( ILuaModuleManager10 *pManager, char *szModuleName, c
 	pModuleManager = pManager;
 
 	// Set the module info
-	strncpy ( szModuleName, MODULE_NAME, MAX_INFO_LENGTH );
-	strncpy ( szAuthor, MODULE_AUTHOR, MAX_INFO_LENGTH );
+	strncpy_s ( szModuleName, _countof ( MODULE_NAME ), MODULE_NAME, MAX_INFO_LENGTH );
+	strncpy_s ( szAuthor, _countof ( MODULE_AUTHOR ), MODULE_AUTHOR, MAX_INFO_LENGTH );
 	(*fVersion) = MODULE_VERSION;
 
 #ifdef WIN32
@@ -38,11 +38,12 @@ MTAEXPORT bool InitModule ( ILuaModuleManager10 *pManager, char *szModuleName, c
 #endif
 
     WSADATA wsaData;
+    int iError = WSAStartup ( MAKEWORD ( 2, 2 ), &wsaData );
 
-    if ( WSAStartup ( MAKEWORD ( 2, 2 ), &wsaData ) != 0 )
+    if ( iError != 0 )
     {
         assert ( false );
-        pModuleManager->ErrorPrintf("[Sockets] Can't start Winsock, aborting...");
+        pModuleManager->ErrorPrintf ( "[Sockets] Can't start Winsock (Error: %d), aborting...", iError );
         return false;
     }
 #endif

sockets/ml_sockets.h

@@ -19,14 +19,6 @@
 #ifndef _MLSOCK_H
 #define _MLSOCK_H
 
-// Disable Visual Studio warnings
-#ifdef WIN32
-    #pragma warning (disable : 4267) // DISABLE: conversion from 'size_t' to 'int', possible loss of data.
-    #pragma warning (disable : 4996) // DISABLE: 'strcpy': This function or variable may be unsafe.
-    #pragma warning (disable : 4244) // DISABLE: conversion from 'SOCKET' to 'int', possible loss of data.
-    #pragma warning (disable : 4800) // DISABLE: 'int' : forcing value to bool 'true' or 'false' (performance warning).
-#endif
-
 #include <assert.h>
 
 /** MODULE SPECIFIC INFORMATION **/