diff options
author | LRN <lrn1986@gmail.com> | 2013-12-19 18:39:21 +0000 |
---|---|---|
committer | LRN <lrn1986@gmail.com> | 2013-12-19 18:39:21 +0000 |
commit | 4715a1778070d339252b24f16d3cca9823d31781 (patch) | |
tree | 05fd6af7555574ee4f4bac7190934aaacf4525d5 /src/gns/w32nsp.c | |
parent | 151b93ed4d318ee67cf0dccdcb219556fb4919b9 (diff) | |
download | gnunet-4715a1778070d339252b24f16d3cca9823d31781.tar.gz gnunet-4715a1778070d339252b24f16d3cca9823d31781.zip |
Silence warnings in W32 NSP
Diffstat (limited to 'src/gns/w32nsp.c')
-rw-r--r-- | src/gns/w32nsp.c | 32 |
1 files changed, 15 insertions, 17 deletions
diff --git a/src/gns/w32nsp.c b/src/gns/w32nsp.c index 6370f64bf..9abdb8bed 100644 --- a/src/gns/w32nsp.c +++ b/src/gns/w32nsp.c | |||
@@ -26,10 +26,11 @@ | |||
26 | * "Network Programming For Microsoft Windows, 2Nd Edition". | 26 | * "Network Programming For Microsoft Windows, 2Nd Edition". |
27 | */ | 27 | */ |
28 | 28 | ||
29 | #if 1 | 29 | #define VERBOSE 0 |
30 | #if !VERBOSE | ||
30 | # define DEBUGLOG(s, ...) | 31 | # define DEBUGLOG(s, ...) |
31 | #endif | 32 | #endif |
32 | #if 0 | 33 | #if VERBOSE |
33 | # define __printf__ printf | 34 | # define __printf__ printf |
34 | # define DEBUGLOG(s, ...) printf (s, ##__VA_ARGS__) | 35 | # define DEBUGLOG(s, ...) printf (s, ##__VA_ARGS__) |
35 | #endif | 36 | #endif |
@@ -143,14 +144,6 @@ add_record (SOCKET s, const wchar_t *name, DWORD flags) | |||
143 | return res; | 144 | return res; |
144 | } | 145 | } |
145 | 146 | ||
146 | static void | ||
147 | free_record (int i) | ||
148 | { | ||
149 | if (records[i].name) | ||
150 | free (records[i].name); | ||
151 | records[i].state = 0; | ||
152 | } | ||
153 | |||
154 | /* These are not defined by mingw.org headers at the moment*/ | 147 | /* These are not defined by mingw.org headers at the moment*/ |
155 | typedef INT (WSPAPI *LPNSPIOCTL) (HANDLE,DWORD,LPVOID,DWORD,LPVOID,DWORD,LPDWORD,LPWSACOMPLETION,LPWSATHREADID); | 148 | typedef INT (WSPAPI *LPNSPIOCTL) (HANDLE,DWORD,LPVOID,DWORD,LPVOID,DWORD,LPDWORD,LPWSACOMPLETION,LPWSATHREADID); |
156 | typedef struct _NSP_ROUTINE_XP { | 149 | typedef struct _NSP_ROUTINE_XP { |
@@ -209,7 +202,6 @@ send_name_to_ip_request (LPWSAQUERYSETW lpqsRestrictions, | |||
209 | char *buf; | 202 | char *buf; |
210 | int ret = 1; | 203 | int ret = 1; |
211 | int i; | 204 | int i; |
212 | uint32_t id; | ||
213 | size_t size = sizeof (struct GNUNET_W32RESOLVER_GetMessage); | 205 | size_t size = sizeof (struct GNUNET_W32RESOLVER_GetMessage); |
214 | size_t namelen = 0; | 206 | size_t namelen = 0; |
215 | if (lpqsRestrictions->lpszServiceInstanceName) | 207 | if (lpqsRestrictions->lpszServiceInstanceName) |
@@ -248,7 +240,9 @@ send_name_to_ip_request (LPWSAQUERYSETW lpqsRestrictions, | |||
248 | { | 240 | { |
249 | if (size != send (*resolver, buf, size, 0)) | 241 | if (size != send (*resolver, buf, size, 0)) |
250 | { | 242 | { |
243 | #if VERBOSE | ||
251 | DWORD err = GetLastError (); | 244 | DWORD err = GetLastError (); |
245 | #endif | ||
252 | closesocket (*resolver); | 246 | closesocket (*resolver); |
253 | *resolver = INVALID_SOCKET; | 247 | *resolver = INVALID_SOCKET; |
254 | DEBUGLOG ("GNUNET_W32NSP_LookupServiceBegin: failed to send request: %lu\n", err); | 248 | DEBUGLOG ("GNUNET_W32NSP_LookupServiceBegin: failed to send request: %lu\n", err); |
@@ -386,7 +380,7 @@ static int WSAAPI | |||
386 | GNUNET_W32NSP_LookupServiceNext (HANDLE hLookup, DWORD dwControlFlags, | 380 | GNUNET_W32NSP_LookupServiceNext (HANDLE hLookup, DWORD dwControlFlags, |
387 | LPDWORD lpdwBufferLength, LPWSAQUERYSETW lpqsResults) | 381 | LPDWORD lpdwBufferLength, LPWSAQUERYSETW lpqsResults) |
388 | { | 382 | { |
389 | DWORD effective_flags; | 383 | /*DWORD effective_flags;*/ |
390 | int i; | 384 | int i; |
391 | struct GNUNET_MessageHeader header = {0, 0}; | 385 | struct GNUNET_MessageHeader header = {0, 0}; |
392 | int rec = -1; | 386 | int rec = -1; |
@@ -419,7 +413,7 @@ GNUNET_W32NSP_LookupServiceNext (HANDLE hLookup, DWORD dwControlFlags, | |||
419 | //LeaveCriticalSection (&records_cs); | 413 | //LeaveCriticalSection (&records_cs); |
420 | return SOCKET_ERROR; | 414 | return SOCKET_ERROR; |
421 | } | 415 | } |
422 | effective_flags = dwControlFlags & records[rec].flags; | 416 | /*effective_flags = dwControlFlags & records[rec].flags;*/ |
423 | if (records[rec].buf) | 417 | if (records[rec].buf) |
424 | { | 418 | { |
425 | DEBUGLOG ("GNUNET_W32NSP_LookupServiceNext: checking buffer\n"); | 419 | DEBUGLOG ("GNUNET_W32NSP_LookupServiceNext: checking buffer\n"); |
@@ -443,11 +437,13 @@ GNUNET_W32NSP_LookupServiceNext (HANDLE hLookup, DWORD dwControlFlags, | |||
443 | //LeaveCriticalSection (&records_cs); | 437 | //LeaveCriticalSection (&records_cs); |
444 | to_receive = sizeof (header); | 438 | to_receive = sizeof (header); |
445 | rc = 0; | 439 | rc = 0; |
440 | #if VERBOSE | ||
446 | { | 441 | { |
447 | unsigned long have; | 442 | unsigned long have; |
448 | int ior = ioctlsocket ((SOCKET) hLookup, FIONREAD, &have); | 443 | int ior = ioctlsocket ((SOCKET) hLookup, FIONREAD, &have); |
449 | DEBUGLOG ("GNUNET_W32NSP_LookupServiceNext: reading %d bytes as a header from %p, %lu bytes available\n", to_receive, hLookup, have); | 444 | DEBUGLOG ("GNUNET_W32NSP_LookupServiceNext: reading %d bytes as a header from %p, %lu bytes available\n", to_receive, hLookup, have); |
450 | } | 445 | } |
446 | #endif | ||
451 | while (to_receive > 0) | 447 | while (to_receive > 0) |
452 | { | 448 | { |
453 | t = recv ((SOCKET) hLookup, &((char *) &header)[rc], to_receive, 0); | 449 | t = recv ((SOCKET) hLookup, &((char *) &header)[rc], to_receive, 0); |
@@ -459,11 +455,13 @@ GNUNET_W32NSP_LookupServiceNext (HANDLE hLookup, DWORD dwControlFlags, | |||
459 | else | 455 | else |
460 | break; | 456 | break; |
461 | } | 457 | } |
458 | #if VERBOSE | ||
462 | { | 459 | { |
463 | unsigned long have; | 460 | unsigned long have; |
464 | int ior = ioctlsocket ((SOCKET) hLookup, FIONREAD, &have); | 461 | int ior = ioctlsocket ((SOCKET) hLookup, FIONREAD, &have); |
465 | DEBUGLOG ("GNUNET_W32NSP_LookupServiceNext: read %d bytes as a header from %p, %lu bytes available\n", rc, hLookup, have); | 462 | DEBUGLOG ("GNUNET_W32NSP_LookupServiceNext: read %d bytes as a header from %p, %lu bytes available\n", rc, hLookup, have); |
466 | } | 463 | } |
464 | #endif | ||
467 | //EnterCriticalSection (&records_cs); | 465 | //EnterCriticalSection (&records_cs); |
468 | records[rec].state &= ~8; | 466 | records[rec].state &= ~8; |
469 | if (rc != sizeof (header)) | 467 | if (rc != sizeof (header)) |
@@ -513,11 +511,13 @@ GNUNET_W32NSP_LookupServiceNext (HANDLE hLookup, DWORD dwControlFlags, | |||
513 | memcpy (buf, &header, sizeof (header)); | 511 | memcpy (buf, &header, sizeof (header)); |
514 | to_receive = header.size - sizeof (header); | 512 | to_receive = header.size - sizeof (header); |
515 | rc = 0; | 513 | rc = 0; |
514 | #if VERBOSE | ||
516 | { | 515 | { |
517 | unsigned long have; | 516 | unsigned long have; |
518 | int ior = ioctlsocket ((SOCKET) hLookup, FIONREAD, &have); | 517 | int ior = ioctlsocket ((SOCKET) hLookup, FIONREAD, &have); |
519 | DEBUGLOG ("GNUNET_W32NSP_LookupServiceNext: reading %d bytes as a body from %p, %lu bytes available\n", to_receive, hLookup, have); | 518 | DEBUGLOG ("GNUNET_W32NSP_LookupServiceNext: reading %d bytes as a body from %p, %lu bytes available\n", to_receive, hLookup, have); |
520 | } | 519 | } |
520 | #endif | ||
521 | while (to_receive > 0) | 521 | while (to_receive > 0) |
522 | { | 522 | { |
523 | DEBUGLOG ("GNUNET_W32NSP_LookupServiceNext: recv (%d)\n", to_receive); | 523 | DEBUGLOG ("GNUNET_W32NSP_LookupServiceNext: recv (%d)\n", to_receive); |
@@ -531,11 +531,13 @@ GNUNET_W32NSP_LookupServiceNext (HANDLE hLookup, DWORD dwControlFlags, | |||
531 | else | 531 | else |
532 | break; | 532 | break; |
533 | } | 533 | } |
534 | #if VERBOSE | ||
534 | { | 535 | { |
535 | unsigned long have; | 536 | unsigned long have; |
536 | int ior = ioctlsocket ((SOCKET) hLookup, FIONREAD, &have); | 537 | int ior = ioctlsocket ((SOCKET) hLookup, FIONREAD, &have); |
537 | DEBUGLOG ("GNUNET_W32NSP_LookupServiceNext: read %d bytes as a body from %p, %lu bytes available\n", rc, hLookup, have); | 538 | DEBUGLOG ("GNUNET_W32NSP_LookupServiceNext: read %d bytes as a body from %p, %lu bytes available\n", rc, hLookup, have); |
538 | } | 539 | } |
540 | #endif | ||
539 | //EnterCriticalSection (&records_cs); | 541 | //EnterCriticalSection (&records_cs); |
540 | records[rec].state &= ~8; | 542 | records[rec].state &= ~8; |
541 | if (rc != header.size - sizeof (header)) | 543 | if (rc != header.size - sizeof (header)) |
@@ -576,12 +578,8 @@ GNUNET_W32NSP_LookupServiceNext (HANDLE hLookup, DWORD dwControlFlags, | |||
576 | static int WSPAPI | 578 | static int WSPAPI |
577 | GNUNET_W32NSP_LookupServiceEnd (HANDLE hLookup) | 579 | GNUNET_W32NSP_LookupServiceEnd (HANDLE hLookup) |
578 | { | 580 | { |
579 | DWORD effective_flags; | ||
580 | int i; | 581 | int i; |
581 | struct GNUNET_MessageHeader header = {0, 0}; | ||
582 | int rec = -1; | 582 | int rec = -1; |
583 | int rc; | ||
584 | char *buf; | ||
585 | 583 | ||
586 | DEBUGLOG ("GNUNET_W32NSP_LookupServiceEnd\n"); | 584 | DEBUGLOG ("GNUNET_W32NSP_LookupServiceEnd\n"); |
587 | //EnterCriticalSection (&records_cs); | 585 | //EnterCriticalSection (&records_cs); |