Commit a07dcfd8 authored by Dan Fandrich's avatar Dan Fandrich
Browse files

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

parent 321511a5

lib/inet_pton.c

+6 −6
Original line number Diff line number Diff line
@@ -74,13 +74,13 @@ Curl_inet_pton(int af, const char *src, void *dst) 
{

  switch (af) {

  case AF_INET:

    return (inet_pton4(src, dst));

    return (inet_pton4(src, (unsigned char *)dst));

#ifdef ENABLE_IPV6

#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

  case AF_INET6:

    return (inet_pton6(src, dst));

    return (inet_pton6(src, (unsigned char *)dst));

#endif

  default:

    errno = EAFNOSUPPORT;
@@ -114,11 +114,11 @@ inet_pton4(const char *src, unsigned char *dst) 
    const char *pch;



    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);

      *tp = new;

      *tp = val;

      if (! saw_digit) {

        if (++octets > 4)

          return (0);