Changeset 48279 in vbox

Timestamp:

Sep 4, 2013 6:01:00 PM (11 years ago)

Author:

vboxsync

Message:

Main/webservice: use SOCKET instead of int (gSOAP has this platform abstraction for quite some time), and make a few additional adjustments to get rid of some more Windows compilation specific warnings

File:

• trunk/src/VBox/Main/webservice/vboxweb.cpp (modified) (6 diffs)

trunk/src/VBox/Main/webservice/vboxweb.cpp

@@ -451 +451 @@
      * @param s Socket from soap_accept() which has work to do.
      */
-    uint32_t add(int s)
-    {
-        uint32_t cItems;
+    size_t add(SOCKET s)
+    {
+        size_t cItems;
         util::AutoWriteLock qlock(m_mutex COMMA_LOCKVAL_SRC_POS);
 
@@ -493 +493 @@
      * @return
      */
-    int get(size_t &cIdleThreads, size_t &cThreads)
+    SOCKET get(size_t &cIdleThreads, size_t &cThreads)
     {
         while (1)
@@ -503 +503 @@
             if (m_llSocketsQ.size())
             {
-                int socket = m_llSocketsQ.front();
+                SOCKET socket = m_llSocketsQ.front();
                 m_llSocketsQ.pop_front();
                 cIdleThreads = --m_cIdleThreads;
@@ -543 +543 @@
     // A std::list abused as a queue; this contains the actual jobs to do,
     // each int being a socket from soap_accept()
-    std::list<int>          m_llSocketsQ;
+    std::list<SOCKET>       m_llSocketsQ;
 };
 
@@ -732 +732 @@
 static unsigned long CRYPTO_id_function()
 {
-    return RTThreadNativeSelf();
+    return (unsigned long)RTThreadNativeSelf();
 }
 
@@ -856 +856 @@
             // avoid EADDRINUSE on bind()
 
-    int m, s; // master and slave sockets
+    SOCKET m, s; // master and slave sockets
     m = soap_bind(&soap,
                   g_pcszBindToHost ? g_pcszBindToHost : "localhost",    // safe default host