From c5c7911dab8732861affbe66849a100da62f7464 Mon Sep 17 00:00:00 2001
From: s_nakamoto <s_nakamoto@1a98c847-1fd6-4fd8-948a-caf3550aa51b>
Date: Wed, 18 Nov 2009 19:19:41 +0000
Subject: bugfix Db::open/close and zombie sockets bugs fix double-close of
 socket handle, keep databases open, close db cursors, initial block download
 in batches of 500 blocks, fix misc warnings, subver linux-test8

git-svn-id: https://bitcoin.svn.sourceforge.net/svnroot/bitcoin/trunk@40 1a98c847-1fd6-4fd8-948a-caf3550aa51b
---
 util.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'util.cpp')

diff --git a/util.cpp b/util.cpp
index 7a947730c..305db5cee 100644
--- a/util.cpp
+++ b/util.cpp
@@ -56,9 +56,11 @@ public:
 
         // Close sockets
         foreach(CNode* pnode, vNodes)
-            closesocket(pnode->hSocket);
-        if (closesocket(hListenSocket) == SOCKET_ERROR)
-            printf("closesocket(hListenSocket) failed with error %d\n", WSAGetLastError());
+            if (pnode->hSocket != INVALID_SOCKET)
+                closesocket(pnode->hSocket);
+        if (hListenSocket != INVALID_SOCKET)
+            if (closesocket(hListenSocket) == SOCKET_ERROR)
+                printf("closesocket(hListenSocket) failed with error %d\n", WSAGetLastError());
 
 #ifdef __WXMSW__
         // Shutdown Windows Sockets
@@ -348,7 +350,7 @@ void ParseParameters(int argc, char* argv[])
     {
         char psz[10000];
         strlcpy(psz, argv[i], sizeof(psz));
-        char* pszValue = "";
+        char* pszValue = (char*)"";
         if (strchr(psz, '='))
         {
             pszValue = strchr(psz, '=');
-- 
cgit v1.2.3