Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(140)

Side by Side Diff: nspr/pr/src/misc/prnetdb.c

Issue 68173008: Update to NSPR 4.10.2. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/nss/
Patch Set: Update README.chromium Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « nspr/pr/src/misc/prlong.c ('k') | nspr/pr/src/misc/prsystem.c » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ 1 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
2 /* This Source Code Form is subject to the terms of the Mozilla Public 2 /* This Source Code Form is subject to the terms of the Mozilla Public
3 * License, v. 2.0. If a copy of the MPL was not distributed with this 3 * License, v. 2.0. If a copy of the MPL was not distributed with this
4 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ 4 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
5 5
6 #include "primpl.h" 6 #include "primpl.h"
7 7
8 #include <string.h> 8 #include <string.h>
9 9
10 /* 10 /*
(...skipping 2245 matching lines...) Expand 10 before | Expand all | Expand 10 after
2256 PRNetAddr addrcopy; 2256 PRNetAddr addrcopy;
2257 #endif 2257 #endif
2258 int rv; /* 0 for success, or the error code EAI_xxx */ 2258 int rv; /* 0 for success, or the error code EAI_xxx */
2259 2259
2260 #ifdef _PR_INET6 2260 #ifdef _PR_INET6
2261 if (addr->raw.family == PR_AF_INET6) 2261 if (addr->raw.family == PR_AF_INET6)
2262 { 2262 {
2263 md_af = AF_INET6; 2263 md_af = AF_INET6;
2264 #ifndef _PR_HAVE_SOCKADDR_LEN 2264 #ifndef _PR_HAVE_SOCKADDR_LEN
2265 addrcopy = *addr; 2265 addrcopy = *addr;
2266 addrcopy.raw.family = AF_INET6; 2266 addrcopy.raw.family = md_af;
2267 addrp = &addrcopy; 2267 addrp = &addrcopy;
2268 #endif 2268 #endif
2269 } 2269 }
2270 #endif 2270 #endif
2271 2271
2272 addrlen = PR_NETADDR_SIZE(addr); 2272 addrlen = PR_NETADDR_SIZE(addr);
2273 #ifdef _PR_HAVE_SOCKADDR_LEN 2273 #ifdef _PR_HAVE_SOCKADDR_LEN
2274 addrcopy = *addr; 2274 addrcopy = *addr;
2275 ((struct sockaddr*)&addrcopy)->sa_len = addrlen; 2275 ((struct sockaddr*)&addrcopy)->sa_len = addrlen;
2276 ((struct sockaddr*)&addrcopy)->sa_family = md_af; 2276 ((struct sockaddr*)&addrcopy)->sa_family = md_af;
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
2333 #if !defined(_PR_HAVE_GETADDRINFO) 2333 #if !defined(_PR_HAVE_GETADDRINFO)
2334 return pr_NetAddrToStringFB(addr, string, size); 2334 return pr_NetAddrToStringFB(addr, string, size);
2335 #else 2335 #else
2336 #if defined(_PR_INET6_PROBE) 2336 #if defined(_PR_INET6_PROBE)
2337 if (!_pr_ipv6_is_present()) 2337 if (!_pr_ipv6_is_present())
2338 return pr_NetAddrToStringFB(addr, string, size); 2338 return pr_NetAddrToStringFB(addr, string, size);
2339 #endif 2339 #endif
2340 return pr_NetAddrToStringGNI(addr, string, size); 2340 return pr_NetAddrToStringGNI(addr, string, size);
2341 #endif 2341 #endif
2342 } /* PR_NetAddrToString */ 2342 } /* PR_NetAddrToString */
OLDNEW
« no previous file with comments | « nspr/pr/src/misc/prlong.c ('k') | nspr/pr/src/misc/prsystem.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698