aboutsummaryrefslogtreecommitdiff
path: root/src/gns
diff options
context:
space:
mode:
authorLRN <lrn1986@gmail.com>2013-04-21 17:53:58 +0000
committerLRN <lrn1986@gmail.com>2013-04-21 17:53:58 +0000
commitc2e9ada76d43c43cabc540f201312339929d1dea (patch)
tree2854196a8bea6298882cf328bad5b164eac2817e /src/gns
parentb9a82e5f30e7db873807285de4e54b03f4cffb57 (diff)
downloadgnunet-c2e9ada76d43c43cabc540f201312339929d1dea.tar.gz
gnunet-c2e9ada76d43c43cabc540f201312339929d1dea.zip
Better fix for w32nsp warnings
Diffstat (limited to 'src/gns')
-rw-r--r--src/gns/w32nsp-resolve.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/src/gns/w32nsp-resolve.c b/src/gns/w32nsp-resolve.c
index 93bd21498..8e08d0717 100644
--- a/src/gns/w32nsp-resolve.c
+++ b/src/gns/w32nsp-resolve.c
@@ -161,8 +161,8 @@ main (int argc, char **argv)
161 int ret; 161 int ret;
162 int r = 1; 162 int r = 1;
163 WSADATA wsd; 163 WSADATA wsd;
164 GUID *prov = NULL; 164 GUID prov;
165 const GUID *sc = NULL; 165 GUID sc;
166 wchar_t *cmdl; 166 wchar_t *cmdl;
167 int wargc; 167 int wargc;
168 wchar_t **wargv; 168 wchar_t **wargv;
@@ -190,19 +190,19 @@ main (int argc, char **argv)
190 if (wargc == 5) 190 if (wargc == 5)
191 { 191 {
192 if (wcscmp (wargv[1], L"A") == 0) 192 if (wcscmp (wargv[1], L"A") == 0)
193 sc = &SVCID_DNS_TYPE_A; 193 sc = SVCID_DNS_TYPE_A;
194 else if (wcscmp (wargv[1], L"AAAA") == 0) 194 else if (wcscmp (wargv[1], L"AAAA") == 0)
195 sc = &SVCID_DNS_TYPE_AAAA; 195 sc = SVCID_DNS_TYPE_AAAA;
196 else if (wcscmp (wargv[1], L"name") == 0) 196 else if (wcscmp (wargv[1], L"name") == 0)
197 sc = &SVCID_HOSTNAME; 197 sc = SVCID_HOSTNAME;
198 else if (wcscmp (wargv[1], L"addr") == 0) 198 else if (wcscmp (wargv[1], L"addr") == 0)
199 sc = &SVCID_INET_HOSTADDRBYNAME; 199 sc = SVCID_INET_HOSTADDRBYNAME;
200 else 200 else
201 wargc -= 1; 201 wargc -= 1;
202 if (wcscmp (wargv[4], L"mswdns") == 0) 202 if (wcscmp (wargv[4], L"mswdns") == 0)
203 prov = &W32_DNS; 203 prov = W32_DNS;
204 else if (wcscmp (wargv[4], L"gnunetdns") == 0) 204 else if (wcscmp (wargv[4], L"gnunetdns") == 0)
205 prov = &GNUNET_NAMESPACE_PROVIDER_DNS; 205 prov = GNUNET_NAMESPACE_PROVIDER_DNS;
206 else 206 else
207 wargc -= 1; 207 wargc -= 1;
208 } 208 }
@@ -222,7 +222,7 @@ main (int argc, char **argv)
222 if (startup != NULL) 222 if (startup != NULL)
223 { 223 {
224 NSP_ROUTINE api; 224 NSP_ROUTINE api;
225 ret = startup (prov, &api); 225 ret = startup (&prov, &api);
226 if (NO_ERROR != ret) 226 if (NO_ERROR != ret)
227 fprintf (stderr, "startup failed\n"); 227 fprintf (stderr, "startup failed\n");
228 else 228 else
@@ -236,10 +236,10 @@ main (int argc, char **argv)
236 memset (&search, 0, sizeof (search)); 236 memset (&search, 0, sizeof (search));
237 search.dwSize = sizeof (search); 237 search.dwSize = sizeof (search);
238 search.lpszServiceInstanceName = (wcscmp (wargv[2], L" ") == 0) ? NULL : wargv[2]; 238 search.lpszServiceInstanceName = (wcscmp (wargv[2], L" ") == 0) ? NULL : wargv[2];
239 search.lpServiceClassId = sc; 239 search.lpServiceClassId = &sc;
240 search.lpNSProviderId = prov; 240 search.lpNSProviderId = &prov;
241 search.dwNameSpace = NS_ALL; 241 search.dwNameSpace = NS_ALL;
242 ret = api.NSPLookupServiceBegin (prov, &search, NULL, LUP_RETURN_ALL, &lookup); 242 ret = api.NSPLookupServiceBegin (&prov, &search, NULL, LUP_RETURN_ALL, &lookup);
243 if (ret != NO_ERROR) 243 if (ret != NO_ERROR)
244 { 244 {
245 fprintf (stderr, "lookup start failed\n"); 245 fprintf (stderr, "lookup start failed\n");
@@ -358,7 +358,7 @@ main (int argc, char **argv)
358 if (ret != NO_ERROR) 358 if (ret != NO_ERROR)
359 printf ("NSPLookupServiceEnd() failed: %lu\n", GetLastError ()); 359 printf ("NSPLookupServiceEnd() failed: %lu\n", GetLastError ());
360 } 360 }
361 api.NSPCleanup (prov); 361 api.NSPCleanup (&prov);
362 } 362 }
363 } 363 }
364 FreeLibrary (nsp); 364 FreeLibrary (nsp);