moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-22 08:08:50 -05:00
Code Issues Releases Wiki Activity

Renamed a variable to avoid conflict with a C++ reserved word.

Browse Source
This commit is contained in:
Dan Fandrich 2004-12-17 20:18:53 +00:00
parent 321511a5be
commit a07dcfd850
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/inet_pton.c
View File

@ -74,13 +74,13 @@ Curl_inet_pton(int af, const char *src, void *dst)
{ {
switch (af) { switch (af) {
case AF_INET: case AF_INET:
return (inet_pton4(src, dst)); return (inet_pton4(src, (unsigned char *)dst));
#ifdef ENABLE_IPV6 #ifdef ENABLE_IPV6
#ifndef AF_INET6 #ifndef AF_INET6
#define AF_INET6 AF_MAX+1 /* just to let this compile */ #define AF_INET6 (AF_MAX+1) /* just to let this compile */
#endif #endif
case AF_INET6: case AF_INET6:
return (inet_pton6(src, dst)); return (inet_pton6(src, (unsigned char *)dst));
#endif #endif
default: default:
errno = EAFNOSUPPORT; errno = EAFNOSUPPORT;
@ -114,11 +114,11 @@ inet_pton4(const char *src, unsigned char *dst)
const char *pch; const char *pch;
if ((pch = strchr(digits, ch)) != NULL) { if ((pch = strchr(digits, ch)) != NULL) {
u_int new = *tp * 10 + (pch - digits); u_int val = *tp * 10 + (pch - digits);
if (new > 255) if (val > 255)
return (0); return (0);
*tp = new; *tp = val;
if (! saw_digit) { if (! saw_digit) {
if (++octets > 4) if (++octets > 4)
return (0); return (0);