diff options
author | Руслан Ижбулатов <lrn1986@gmail.com> | 2017-02-25 12:43:25 +0000 |
---|---|---|
committer | Руслан Ижбулатов <lrn1986@gmail.com> | 2017-02-25 21:01:47 +0000 |
commit | b4c3f31e666236ec63358533559a470bff1dfbfd (patch) | |
tree | 66fc95812ecedfeb8a756105663dd3ef0ee0f03a /src/util | |
parent | a57e7703ff28c2286c4f911b87ceea21782f331f (diff) | |
download | gnunet-b4c3f31e666236ec63358533559a470bff1dfbfd.tar.gz gnunet-b4c3f31e666236ec63358533559a470bff1dfbfd.zip |
W32: adapt the code to GNUNET_memcpy() that returns nothing
Diffstat (limited to 'src/util')
-rw-r--r-- | src/util/win.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/util/win.c b/src/util/win.c index 7cd7e0f3c..97877b0ca 100644 --- a/src/util/win.c +++ b/src/util/win.c | |||
@@ -534,10 +534,9 @@ EnumNICs3 (struct EnumNICs3_results **results, int *results_count) | |||
534 | for (i = 0; !found && i < interfaces4_len / sizeof (INTERFACE_INFO); i++) | 534 | for (i = 0; !found && i < interfaces4_len / sizeof (INTERFACE_INFO); i++) |
535 | { | 535 | { |
536 | struct sockaddr_in *m = (struct sockaddr_in *) &r->mask; | 536 | struct sockaddr_in *m = (struct sockaddr_in *) &r->mask; |
537 | if (GNUNET_memcpy (&interfaces4[i].iiAddress.Address, | 537 | GNUNET_memcpy (&interfaces4[i].iiAddress.Address, |
538 | unicast->Address.lpSockaddr, | 538 | unicast->Address.lpSockaddr, |
539 | unicast->Address.iSockaddrLength) != 0) | 539 | unicast->Address.iSockaddrLength); |
540 | continue; | ||
541 | found = 1; | 540 | found = 1; |
542 | GNUNET_memcpy (&r->address, &interfaces4[i].iiAddress.Address, | 541 | GNUNET_memcpy (&r->address, &interfaces4[i].iiAddress.Address, |
543 | sizeof (struct sockaddr_in)); | 542 | sizeof (struct sockaddr_in)); |
@@ -557,10 +556,9 @@ EnumNICs3 (struct EnumNICs3_results **results, int *results_count) | |||
557 | interfaces6 != NULL && !found && i < interfaces6->iAddressCount; | 556 | interfaces6 != NULL && !found && i < interfaces6->iAddressCount; |
558 | i++) | 557 | i++) |
559 | { | 558 | { |
560 | if (GNUNET_memcpy (interfaces6->Address[i].lpSockaddr, | 559 | GNUNET_memcpy (interfaces6->Address[i].lpSockaddr, |
561 | unicast->Address.lpSockaddr, | 560 | unicast->Address.lpSockaddr, |
562 | unicast->Address.iSockaddrLength) != 0) | 561 | unicast->Address.iSockaddrLength); |
563 | continue; | ||
564 | found = 1; | 562 | found = 1; |
565 | GNUNET_memcpy (&r->address, interfaces6->Address[i].lpSockaddr, | 563 | GNUNET_memcpy (&r->address, interfaces6->Address[i].lpSockaddr, |
566 | sizeof (struct sockaddr_in6)); | 564 | sizeof (struct sockaddr_in6)); |