From ba7f27a3f6d804998a8f09ad8c3d807926c20989 Mon Sep 17 00:00:00 2001 From: Gisle Vanem Date: Sat, 22 Jul 2006 15:21:13 +0000 Subject: [PATCH] Added CVS id. --- ares/ares__close_sockets.c | 2 ++ ares/ares__get_hostent.c | 2 ++ ares/ares__read_line.c | 2 ++ ares/ares_cancel.c | 2 ++ ares/ares_destroy.c | 2 ++ ares/ares_expand_name.c | 2 ++ ares/ares_expand_string.c | 6 ++++-- ares/ares_free_hostent.c | 2 ++ ares/ares_free_string.c | 3 +++ ares/ares_gethostbyname.c | 2 ++ ares/ares_mkquery.c | 3 +++ ares/ares_parse_a_reply.c | 2 ++ ares/ares_parse_ptr_reply.c | 2 ++ ares/ares_query.c | 2 ++ ares/ares_search.c | 2 ++ ares/ares_send.c | 2 ++ ares/ares_strerror.c | 2 ++ ares/ares_timeout.c | 2 ++ ares/bitncmp.c | 2 ++ ares/inet_net_pton.c | 2 ++ ares/setup.h | 2 ++ ares/windows_port.c | 2 ++ 22 files changed, 48 insertions(+), 2 deletions(-) diff --git a/ares/ares__close_sockets.c b/ares/ares__close_sockets.c index 7475a4b44..dcb319ec8 100644 --- a/ares/ares__close_sockets.c +++ b/ares/ares__close_sockets.c @@ -1,3 +1,5 @@ +/* $Id: */ + /* Copyright 1998 by the Massachusetts Institute of Technology. * * Permission to use, copy, modify, and distribute this diff --git a/ares/ares__get_hostent.c b/ares/ares__get_hostent.c index ca6f2f1c0..52204005c 100644 --- a/ares/ares__get_hostent.c +++ b/ares/ares__get_hostent.c @@ -1,3 +1,5 @@ +/* $Id: */ + /* Copyright 1998 by the Massachusetts Institute of Technology. * * Permission to use, copy, modify, and distribute this diff --git a/ares/ares__read_line.c b/ares/ares__read_line.c index f4d4f505b..d9659043d 100644 --- a/ares/ares__read_line.c +++ b/ares/ares__read_line.c @@ -1,3 +1,5 @@ +/* $Id: */ + /* Copyright 1998 by the Massachusetts Institute of Technology. * * Permission to use, copy, modify, and distribute this diff --git a/ares/ares_cancel.c b/ares/ares_cancel.c index 4df1e9f5b..f2f6c7e22 100644 --- a/ares/ares_cancel.c +++ b/ares/ares_cancel.c @@ -1,3 +1,5 @@ +/* $Id: */ + /* Copyright (C) 2004 by Daniel Stenberg et al * * Permission to use, copy, modify, and distribute this software and its diff --git a/ares/ares_destroy.c b/ares/ares_destroy.c index d3860da13..61028a630 100644 --- a/ares/ares_destroy.c +++ b/ares/ares_destroy.c @@ -1,3 +1,5 @@ +/* $Id: */ + /* Copyright 1998 by the Massachusetts Institute of Technology. * * Permission to use, copy, modify, and distribute this diff --git a/ares/ares_expand_name.c b/ares/ares_expand_name.c index 8c5be9b44..950ea740f 100644 --- a/ares/ares_expand_name.c +++ b/ares/ares_expand_name.c @@ -1,3 +1,5 @@ +/* $Id: */ + /* Copyright 1998 by the Massachusetts Institute of Technology. * * Permission to use, copy, modify, and distribute this diff --git a/ares/ares_expand_string.c b/ares/ares_expand_string.c index dcb0c0290..58d209ad5 100644 --- a/ares/ares_expand_string.c +++ b/ares/ares_expand_string.c @@ -1,3 +1,5 @@ +/* $Id: */ + /* Copyright 1998 by the Massachusetts Institute of Technology. * * Permission to use, copy, modify, and distribute this @@ -53,13 +55,13 @@ int ares_expand_string(const unsigned char *encoded, *s = malloc(len+1); if (*s == NULL) return ARES_ENOMEM; - q = *s; + q = *s; strncpy((char *)q, (char *)encoded, len); q[len] = '\0'; *s = q; - *enclen = len+1; + *enclen = len+1; return ARES_SUCCESS; } diff --git a/ares/ares_free_hostent.c b/ares/ares_free_hostent.c index 8d6967eed..a41624fc1 100644 --- a/ares/ares_free_hostent.c +++ b/ares/ares_free_hostent.c @@ -1,3 +1,5 @@ +/* $Id: */ + /* Copyright 1998 by the Massachusetts Institute of Technology. * * Permission to use, copy, modify, and distribute this diff --git a/ares/ares_free_string.c b/ares/ares_free_string.c index 5fa646b46..2da45bc98 100644 --- a/ares/ares_free_string.c +++ b/ares/ares_free_string.c @@ -1,3 +1,5 @@ +/* $Id: */ + /* Copyright 2000 by the Massachusetts Institute of Technology. * * Permission to use, copy, modify, and distribute this @@ -16,6 +18,7 @@ #include "setup.h" #include #include "ares.h" +#include "ares_private.h" void ares_free_string(void *str) { diff --git a/ares/ares_gethostbyname.c b/ares/ares_gethostbyname.c index bdc902974..e1696ac0e 100644 --- a/ares/ares_gethostbyname.c +++ b/ares/ares_gethostbyname.c @@ -1,3 +1,5 @@ +/* $Id: */ + /* Copyright 1998 by the Massachusetts Institute of Technology. * * Permission to use, copy, modify, and distribute this diff --git a/ares/ares_mkquery.c b/ares/ares_mkquery.c index d5c40cb74..43b67549a 100644 --- a/ares/ares_mkquery.c +++ b/ares/ares_mkquery.c @@ -1,3 +1,5 @@ +/* $Id: */ + /* Copyright 1998 by the Massachusetts Institute of Technology. * * Permission to use, copy, modify, and distribute this @@ -30,6 +32,7 @@ #include #include "ares.h" #include "ares_dns.h" +#include "ares_private.h" /* Header format, from RFC 1035: * 1 1 1 1 1 1 diff --git a/ares/ares_parse_a_reply.c b/ares/ares_parse_a_reply.c index 8f69bf0e6..60246d36a 100644 --- a/ares/ares_parse_a_reply.c +++ b/ares/ares_parse_a_reply.c @@ -1,3 +1,5 @@ +/* $Id: */ + /* Copyright 1998 by the Massachusetts Institute of Technology. * * Permission to use, copy, modify, and distribute this diff --git a/ares/ares_parse_ptr_reply.c b/ares/ares_parse_ptr_reply.c index 2bac907db..21ea8fae1 100644 --- a/ares/ares_parse_ptr_reply.c +++ b/ares/ares_parse_ptr_reply.c @@ -1,3 +1,5 @@ +/* $Id: */ + /* Copyright 1998 by the Massachusetts Institute of Technology. * * Permission to use, copy, modify, and distribute this diff --git a/ares/ares_query.c b/ares/ares_query.c index 47c0670eb..4f044d886 100644 --- a/ares/ares_query.c +++ b/ares/ares_query.c @@ -1,3 +1,5 @@ +/* $Id: */ + /* Copyright 1998 by the Massachusetts Institute of Technology. * * Permission to use, copy, modify, and distribute this diff --git a/ares/ares_search.c b/ares/ares_search.c index dc416c026..816e160ea 100644 --- a/ares/ares_search.c +++ b/ares/ares_search.c @@ -1,3 +1,5 @@ +/* $Id: */ + /* Copyright 1998 by the Massachusetts Institute of Technology. * * Permission to use, copy, modify, and distribute this diff --git a/ares/ares_send.c b/ares/ares_send.c index 83cea8017..f0a85ad4e 100644 --- a/ares/ares_send.c +++ b/ares/ares_send.c @@ -1,3 +1,5 @@ +/* $Id: */ + /* Copyright 1998 by the Massachusetts Institute of Technology. * * Permission to use, copy, modify, and distribute this diff --git a/ares/ares_strerror.c b/ares/ares_strerror.c index 6e9fa0edd..326e6fba8 100644 --- a/ares/ares_strerror.c +++ b/ares/ares_strerror.c @@ -1,3 +1,5 @@ +/* $Id: */ + /* Copyright 1998 by the Massachusetts Institute of Technology. * * Permission to use, copy, modify, and distribute this diff --git a/ares/ares_timeout.c b/ares/ares_timeout.c index c550218da..c6af87e3c 100644 --- a/ares/ares_timeout.c +++ b/ares/ares_timeout.c @@ -1,3 +1,5 @@ +/* $Id: */ + /* Copyright 1998 by the Massachusetts Institute of Technology. * * Permission to use, copy, modify, and distribute this diff --git a/ares/bitncmp.c b/ares/bitncmp.c index 0da540fff..0d4ce565a 100644 --- a/ares/bitncmp.c +++ b/ares/bitncmp.c @@ -1,3 +1,5 @@ +/* $Id: */ + /* * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC") * Copyright (c) 1996,1999 by Internet Software Consortium. diff --git a/ares/inet_net_pton.c b/ares/inet_net_pton.c index e028ec66b..3621bb8d2 100644 --- a/ares/inet_net_pton.c +++ b/ares/inet_net_pton.c @@ -1,3 +1,5 @@ +/* $Id: */ + /* * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC") * Copyright (c) 1996,1999 by Internet Software Consortium. diff --git a/ares/setup.h b/ares/setup.h index c6ec2618e..4dcfa8134 100644 --- a/ares/setup.h +++ b/ares/setup.h @@ -1,6 +1,8 @@ #ifndef __ARES_SETUP_H #define __ARES_SETUP_H +/* $Id: */ + /* Copyright (C) 2004 - 2005 by Daniel Stenberg et al * * Permission to use, copy, modify, and distribute this software and its diff --git a/ares/windows_port.c b/ares/windows_port.c index e80d00d5c..3dc8c78fa 100644 --- a/ares/windows_port.c +++ b/ares/windows_port.c @@ -1,5 +1,7 @@ #include "setup.h" +/* $Id: */ + /* only do the following on windows */ #if (defined(WIN32) || defined(WATT32)) && !defined(MSDOS)