Commit f1aa936d authored by Yang Tse's avatar Yang Tse
Browse files

Fix compiler warning

parent a5ba25a5

ares/ares__read_line.c

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ int ares__read_line(FILE *fp, char **buf, size_t *bufsize) 


  while (1)

    {

      if (!fgets(*buf + offset, *bufsize - offset, fp))

      if (!fgets(*buf + offset, (int)(*bufsize - offset), fp))

        return (offset != 0) ? 0 : (ferror(fp)) ? ARES_EFILE : ARES_EOF;

      len = offset + strlen(*buf + offset);

      if ((*buf)[len - 1] == '\n')

ares/inet_net_pton.c

+7 −6
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ inet_net_pton_ipv4(const char *src, unsigned char *dst, size_t size) 
  if (ch == '0' && (src[0] == 'x' || src[0] == 'X')

      && ISXDIGIT(src[1])) {

    /* Hexadecimal: Eat nybble string. */

    if (size <= 0U)

    if (!size)

      goto emsgsize;

    dirty = 0;

    src++;  /* skip x or X. */
@@ -94,14 +94,14 @@ inet_net_pton_ipv4(const char *src, unsigned char *dst, size_t size) 
      else

        tmp = (tmp << 4) | n;

      if (++dirty == 2) {

        if (size-- <= 0U)

        if (!size--)

          goto emsgsize;

        *dst++ = (unsigned char) tmp;

        dirty = 0;

      }

    }

    if (dirty) {  /* Odd trailing nybble? */

      if (size-- <= 0U)

      if (!size--)

        goto emsgsize;

      *dst++ = (unsigned char) (tmp << 4);

    }
@@ -117,7 +117,7 @@ inet_net_pton_ipv4(const char *src, unsigned char *dst, size_t size) 
          goto enoent;

      } while ((ch = *src++) != '\0' &&

               ISDIGIT(ch));

      if (size-- <= 0U)

      if (!size--)

        goto emsgsize;

      *dst++ = (unsigned char) tmp;

      if (ch == '\0' || ch == '/')
@@ -179,7 +179,7 @@ inet_net_pton_ipv4(const char *src, unsigned char *dst, size_t size) 
  }

  /* Extend network to cover the actual mask. */

  while (bits > ((dst - odst) * 8)) {

    if (size-- <= 0U)

    if (!size--)

      goto emsgsize;

    *dst++ = '\0';

  }
@@ -426,7 +426,8 @@ ares_inet_net_pton(int af, const char *src, void *dst, size_t size) 
#ifndef HAVE_INET_PTON

int ares_inet_pton(int af, const char *src, void *dst)

{

  int size, result;

  int result;

  size_t size;



  if (af == AF_INET)

    size = sizeof(struct in_addr);