Commit 8f8ba948 authored by Yang Tse's avatar Yang Tse
Browse files

Fix compiler warning

parent f55924b3

ares/inet_ntop.c

+10 −2
Original line number Diff line number Diff line
@@ -129,8 +129,12 @@ inet_ntop6(const unsigned char *src, char *dst, size_t size) 
   * Keep this in mind if you think this function should have been coded

   * to use pointer overlays.  All the world's not a VAX.

   */

  char tmp[sizeof "ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255"], *tp;

  struct { int base, len; } best = { 0,0 }, cur = { 0,0 };

  char tmp[sizeof("ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255")];

  char *tp;

  struct {

    long base;

    long len;

  } best, cur;

  unsigned int words[NS_IN6ADDRSZ / NS_INT16SZ];

  int i;
@@ -142,8 +146,12 @@ inet_ntop6(const unsigned char *src, char *dst, size_t size) 
  memset(words, '\0', sizeof words);

  for (i = 0; i < NS_IN6ADDRSZ; i++)

      words[i / 2] |= (src[i] << ((1 - (i % 2)) << 3));



  best.base = -1;

  cur.base = -1;

  best.len = 0;

  cur.len = 0;



  for (i = 0; i < (NS_IN6ADDRSZ / NS_INT16SZ); i++)

    {

      if (words[i] == 0)

lib/inet_ntop.c

+6 −3
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ static char *inet_ntop6 (const unsigned char *src, char *dst, size_t size) 
    long base;

    long len;

  } best, cur;

  u_long words [IN6ADDRSZ / INT16SZ];

  unsigned long words[IN6ADDRSZ / INT16SZ];

  int i;



  /* Preprocess:
@@ -125,6 +125,9 @@ static char *inet_ntop6 (const unsigned char *src, char *dst, size_t size) 


  best.base = -1;

  cur.base  = -1;

  best.len = 0;

  cur.len = 0;



  for (i = 0; i < (IN6ADDRSZ / INT16SZ); i++)

  {

    if (words[i] == 0)