From: LRN <lrn1986@gmail.com>
Date: Thu, 19 Dec 2013 18:39:19 +0000 (+0000)
Subject: Remove unused macros, use a different error code for early bailouts
X-Git-Tag: initial-import-from-subversion-38251~5280
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=151b93ed4d318ee67cf0dccdcb219556fb4919b9;p=oweals%2Fgnunet.git

Remove unused macros, use a different error code for early bailouts
---

diff --git a/src/gns/w32nsp.c b/src/gns/w32nsp.c
index 5ad9fc753..6370f64bf 100644
--- a/src/gns/w32nsp.c
+++ b/src/gns/w32nsp.c
@@ -77,13 +77,6 @@
 #define NSPAPI_VERSION_MAJOR 4
 #define NSPAPI_VERSION_MINOR 4
 
-#define REPLY_LIFETIME 60*5
-
-#define STATE_BEGIN  0x01
-#define STATE_END    0x02
-#define STATE_REPLY  0x04
-#define STATE_GHBN   0x08
-
 static CRITICAL_SECTION records_cs;
 
 struct record
@@ -318,7 +311,7 @@ GNUNET_W32NSP_LookupServiceBegin (LPGUID lpProviderId, LPWSAQUERYSETW lpqsRestri
     if (lpqsRestrictions->dwNameSpace != NS_DNS && lpqsRestrictions->dwNameSpace != NS_ALL)
     {
       DEBUGLOG ("GNUNET_W32NSP_LookupServiceBegin: wrong namespace\n");
-      SetLastError (WSANO_DATA);
+      SetLastError (WSAEINVAL);
       return SOCKET_ERROR;
     }
     if (lpqsRestrictions->lpszServiceInstanceName != NULL)
@@ -334,7 +327,7 @@ GNUNET_W32NSP_LookupServiceBegin (LPGUID lpProviderId, LPWSAQUERYSETW lpqsRestri
       else
       {
         DEBUGLOG ("GNUNET_W32NSP_LookupServiceBegin: unsupported TLD\n");
-        SetLastError (WSANO_DATA);
+        SetLastError (WSAEINVAL);
         return SOCKET_ERROR;
       }
     }