diff options
| author | Alex Deymo <deymo@google.com> | 2017-12-19 19:04:07 +0100 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2017-12-20 14:03:33 -0800 |
| commit | 486467e11b5904b3e04adc2f5fdb96fcfe65da84 (patch) | |
| tree | 492c1de56730f0b42bba1f651aa78c8cac13cfa7 /lib/if2ip.c | |
| parent | 7d91b4f63bd1fd29c11c9ff1ba6e7c42622e0687 (diff) | |
| download | android_external_curl-486467e11b5904b3e04adc2f5fdb96fcfe65da84.tar.gz android_external_curl-486467e11b5904b3e04adc2f5fdb96fcfe65da84.tar.bz2 android_external_curl-486467e11b5904b3e04adc2f5fdb96fcfe65da84.zip | |
Update from 7.55.1 to 7.57.0
Update the local patch to match the new config. Removed the
packages/Android/Android.mk file added by upstream (outdated Android.mk
version which will confuse people). Updated Android.bp with the new files.
Bug: http://b/70741465
Test: builds, boots, `vendor/google/tools/fake-ota on streaming` works
Change-Id: Ib2411f5e64db4e11ffd916dc81cd23b46888b900
Diffstat (limited to 'lib/if2ip.c')
| -rw-r--r-- | lib/if2ip.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/if2ip.c b/lib/if2ip.c index a91b6d2..ce38ea1 100644 --- a/lib/if2ip.c +++ b/lib/if2ip.c @@ -103,7 +103,7 @@ bool Curl_if_is_interface_name(const char *interf) struct ifaddrs *iface, *head; if(getifaddrs(&head) >= 0) { - for(iface=head; iface != NULL; iface=iface->ifa_next) { + for(iface = head; iface != NULL; iface = iface->ifa_next) { if(strcasecompare(iface->ifa_name, interf)) { result = TRUE; break; @@ -131,7 +131,7 @@ if2ip_result_t Curl_if2ip(int af, unsigned int remote_scope, #endif if(getifaddrs(&head) >= 0) { - for(iface = head; iface != NULL; iface=iface->ifa_next) { + for(iface = head; iface != NULL; iface = iface->ifa_next) { if(iface->ifa_addr != NULL) { if(iface->ifa_addr->sa_family == af) { if(strcasecompare(iface->ifa_name, interf)) { @@ -230,7 +230,7 @@ if2ip_result_t Curl_if2ip(int af, unsigned int remote_scope, return IF2IP_NOT_FOUND; memset(&req, 0, sizeof(req)); - memcpy(req.ifr_name, interf, len+1); + memcpy(req.ifr_name, interf, len + 1); req.ifr_addr.sa_family = AF_INET; if(ioctl(dummy, SIOCGIFADDR, &req) < 0) { |