From 63397e380f6491c3dc304079b8aa9465d2f268c1 Mon Sep 17 00:00:00 2001
From: Yang Tse <yangsita@gmail.com>
Date: Fri, 17 Oct 2008 19:04:53 +0000
Subject: [PATCH] fix compiler warning
---
ares/acountry.c | 7 ++++---
ares/adig.c | 3 ++-
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/ares/acountry.c b/ares/acountry.c
index 52ef62e25e..37aed60b77 100644
--- a/ares/acountry.c
+++ b/ares/acountry.c
@@ -523,7 +523,8 @@ static int is_addr(char *str, char **end)
{
int a0, a1, a2, a3, num, rc = 0, length = 0;
- if ((num = sscanf(str,"%3d.%3d.%3d.%3d%n",&a0,&a1,&a2,&a3,&length)) == 4 &&
+ num = sscanf(str,"%3d.%3d.%3d.%3d%n",&a0,&a1,&a2,&a3,&length);
+ if( (num == 4) &&
BYTE_OK(a0) && BYTE_OK(a1) && BYTE_OK(a2) && BYTE_OK(a3) &&
length >= (3+4))
{
@@ -583,8 +584,8 @@ static void find_country_from_cname(const char *cname, struct in_addr addr)
if (ver_1)
{
- ccode_A2[0] = tolower(cname[2]);
- ccode_A2[1] = tolower(cname[3]);
+ ccode_A2[0] = (char)tolower(cname[2]);
+ ccode_A2[1] = (char)tolower(cname[3]);
ccode_A2[2] = '\0';
}
else
diff --git a/ares/adig.c b/ares/adig.c
index cc0d42d561..7df32d9f94 100644
--- a/ares/adig.c
+++ b/ares/adig.c
@@ -57,6 +57,7 @@
#include "ares.h"
#include "ares_dns.h"
#include "inet_ntop.h"
+#include "inet_net_pton.h"
#include "ares_getopt.h"
#ifndef HAVE_STRDUP
@@ -213,7 +214,7 @@ int main(int argc, char **argv)
case 's':
/* Add a server, and specify servers in the option mask. */
- if (inet_pton(AF_INET, optarg, &inaddr) <= 0)
+ if (ares_inet_pton(AF_INET, optarg, &inaddr) <= 0)
{
hostent = gethostbyname(optarg);
if (!hostent || hostent->h_addrtype != AF_INET)
--
GitLab