summaryrefslogtreecommitdiff
path: root/src/or/eventdns.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2009-09-01 15:59:40 -0400
committerNick Mathewson <nickm@torproject.org>2009-09-01 15:59:40 -0400
commit1cda6f3e756c2e76d50d398726c5b1851556756f (patch)
tree6532b12c8f7cc40b7daecb810e49596c6f509647 /src/or/eventdns.c
parentd76fd59a7ee49b36591708070d1e50d8a50c67d0 (diff)
parentbddda9bbdb047e52652f7c6f9c2047df15a4e08e (diff)
downloadtor-1cda6f3e756c2e76d50d398726c5b1851556756f.tar.gz
tor-1cda6f3e756c2e76d50d398726c5b1851556756f.zip
Merge commit 'origin/maint-0.2.1'
Diffstat (limited to 'src/or/eventdns.c')
-rw-r--r--src/or/eventdns.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/or/eventdns.c b/src/or/eventdns.c
index b413b6ae97..edccb4bfa6 100644
--- a/src/or/eventdns.c
+++ b/src/or/eventdns.c
@@ -2332,7 +2332,7 @@ out1:
/* exported function */
int
-evdns_nameserver_add(unsigned long int address) {
+evdns_nameserver_add(uint32_t address) {
struct sockaddr_in sin;
memset(&sin, 0, sizeof(sin));
sin.sin_family = AF_INET;
@@ -2363,13 +2363,13 @@ evdns_nameserver_ip_add(const char *ip_as_string) {
cp = strchr(ip_as_string, ':');
if (*ip_as_string == '[') {
- int len;
+ size_t len;
if (!(cp = strchr(ip_as_string, ']'))) {
log(EVDNS_LOG_DEBUG, "Nameserver missing closing ]");
return 4;
}
len = cp-(ip_as_string + 1);
- if (len > (int)sizeof(buf)-1) {
+ if (len > sizeof(buf)-1) {
log(EVDNS_LOG_DEBUG, "[Nameserver] does not fit in buffer.");
return 4;
}