diff --git a/CHANGES.0 b/CHANGES.0 index 73fe8c77..0da401ea 100644 --- a/CHANGES.0 +++ b/CHANGES.0 @@ -250,7 +250,7 @@ Version 1.7.0 (Nov 30, 2009) which are _not_ related with memory tracking. For the c-ares library when --enable-debug is given it does not enable the memory tracking feature. If you wish to enable the curl debug memory tracking you must use configure - option --enable-curldebug explicitily to do so. + option --enable-curldebug explicitly to do so. Internally, definition of preprocessor symbol DEBUGBUILD restricts code which is only compiled for debug enabled builds. And symbol CURLDEBUG is @@ -376,7 +376,7 @@ Version 1.6.0 (Dec 9, 2008) buffer to shrink instead of expand if a reply contained 8 or more records. * Nov 25 2008 (Yang Tse) -- In preparation for the upcomming IPv6 nameservers patch, the internal +- In preparation for the upcoming IPv6 nameservers patch, the internal ares_addr union is now changed into an internal struct which also holds the address family. @@ -533,7 +533,7 @@ Version 1.5.3 (Aug 29, 2008) elsewhere). The define was also somewhat artificially used in the windows port. Now, I instead rewrote the use of gethostbyname to enlarge the host name buffer in case of need and totally avoid the use of the MAXHOSTNAMELEN - define. I thus also removed the defien from the namser.h file where it was + define. I thus also removed the define from the namser.h file where it was once added for the windows build. I also fixed init_by_defaults() function to not leak memory in case if @@ -673,7 +673,7 @@ Version 1.5.0 (Nov 21, 2007) 3. The third problem is that Valgrind assumes that query->qid is not initialised correctly. And it does that because query->qid is set from - DNS_HEADER_QID(qbuf); Valgrind says that qbuf has unitialised bytes. And + DNS_HEADER_QID(qbuf); Valgrind says that qbuf has uninitialised bytes. And qbuf has uninitialised bytes because of channel->next_id . And next_id is set by ares_init.c:ares__generate_new_id() . I found that putting short r=0 in this function (instead of short r) makes all Valgrind warnings go away. @@ -681,8 +681,8 @@ Version 1.5.0 (Nov 21, 2007) buffer_ptr[counter] ^= state[xorIndex]; (ares_query.c:62) - This is what triggers Valgrind.. buffer_ptr is unitialised in this function, - and by applying ^= on it, it remains unitialised. + This is what triggers Valgrind.. buffer_ptr is uninitialised in this function, + and by applying ^= on it, it remains uninitialised. Version 1.4.0 (June 8, 2007) @@ -1094,7 +1094,7 @@ Version 1.2.1 (October 20, 2004) from a series of registry branches. This can be wrong in the case where DHCP has assigned nameservers, but the - user has overridden these servers with other prefered settings. Then it's + user has overridden these servers with other preferred settings. Then it's wrong to use the DHCPNAMESERVER setting in registry. In the case of no global DHCP-assigned or fixed servers, but DNS server(s) diff --git a/CMakeLists.txt b/CMakeLists.txt index beda6f89..be58defb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -56,7 +56,7 @@ ENDIF () IF ((CARES_BUILD_TESTS OR CARES_BUILD_CONTAINER_TESTS) AND (NOT CARES_STATIC) AND WIN32) SET (CARES_STATIC ON) SET (CARES_STATIC_PIC ON) - MESSAGE (WARNING "Static building was requested be disabled, but reenabled to support tests") + MESSAGE (WARNING "Static building was requested be disabled, but re-enabled to support tests") ENDIF () INCLUDE (EnableWarnings) diff --git a/Makefile.netware b/Makefile.netware index 790b17a8..5ebbc762 100644 --- a/Makefile.netware +++ b/Makefile.netware @@ -92,7 +92,7 @@ ifeq ($(LIBARCH),LIBC) CFLAGS += -align 4 else # PRELUDE = $(SDK_CLIB)/imports/clibpre.o - # to avoid the __init_* / __deinit_* whoes dont use prelude from NDK + # to avoid the __init_* / __deinit_* whose dont use prelude from NDK PRELUDE = "$(MWCW_PATH)/libraries/runtime/prelude.obj" # CFLAGS += -include "$(MWCW_PATH)/headers/nlm_clib_prefix.h" CFLAGS += -align 1 @@ -114,7 +114,7 @@ ifeq ($(LIBARCH),LIBC) PRELUDE = $(SDK_LIBC)/imports/libcpre.gcc.o else # PRELUDE = $(SDK_CLIB)/imports/clibpre.gcc.o - # to avoid the __init_* / __deinit_* whoes dont use prelude from NDK + # to avoid the __init_* / __deinit_* whose dont use prelude from NDK # http://www.gknw.net/development/mk_nlm/gcc_pre.zip PRELUDE = $(NDK_ROOT)/pre/prelude.o CFLAGS += -include $(NDKBASE)/nlmconv/genlm.h diff --git a/configure.ac b/configure.ac index 35b79584..0c52a647 100644 --- a/configure.ac +++ b/configure.ac @@ -951,7 +951,7 @@ AC_C_BIGENDIAN( [AC_DEFINE(ARES_BIG_ENDIAN, 1, [define this if ares is built for a big endian system])], , - [AC_MSG_WARN([couldn't figure out endianess, assuming little endian!])] + [AC_MSG_WARN([couldn't figure out endianness, assuming little endian!])] ) dnl Check for user-specified random device diff --git a/docs/acountry.1 b/docs/acountry.1 index 60df54d0..0c024039 100644 --- a/docs/acountry.1 +++ b/docs/acountry.1 @@ -52,7 +52,7 @@ The DNSBL countries.nerd.dk .br \fBhttp://countries.nerd.dk/\fR .SH COPYRIGHT -This utility is based on code/ideas contained in sofware written by Greg Hudson (ares) +This utility is based on code/ideas contained in software written by Greg Hudson (ares) carrying the following notice: .br Copyright 1998 by the Massachusetts Institute of Technology. diff --git a/docs/adig.1 b/docs/adig.1 index 38947166..f747d15b 100644 --- a/docs/adig.1 +++ b/docs/adig.1 @@ -79,7 +79,7 @@ Report bugs to the c-ares mailing list: .PP acountry(1), ahost(1). .SH COPYRIGHT -This utility is based on code/ideas contained in sofware written by Greg Hudson (ares) +This utility is based on code/ideas contained in software written by Greg Hudson (ares) carrying the following notice: .br Copyright 1998 by the Massachusetts Institute of Technology. diff --git a/docs/ahost.1 b/docs/ahost.1 index 30b968de..3cad8b77 100644 --- a/docs/ahost.1 +++ b/docs/ahost.1 @@ -59,7 +59,7 @@ Report bugs to the c-ares mailing list: .PP acountry(1), adig(1). .SH COPYRIGHT -This utility is based on code/ideas contained in sofware written by Greg Hudson (ares) +This utility is based on code/ideas contained in software written by Greg Hudson (ares) carrying the following notice: .br Copyright 1998 by the Massachusetts Institute of Technology. diff --git a/docs/ares_dns_record.3 b/docs/ares_dns_record.3 index 1577d898..39232417 100644 --- a/docs/ares_dns_record.3 +++ b/docs/ares_dns_record.3 @@ -204,7 +204,7 @@ this code signifies that the domain name referenced in the query does not exist. - Not implemented. The name server does not support the requested kind of query .br .B ARES_RCODE_REFUSED -- Refused. The name server refuses to perform the speciied operation for policy +- Refused. The name server refuses to perform the specified operation for policy reasons. .br .B ARES_RCODE_YXDOMAIN diff --git a/docs/ares_init_options.3 b/docs/ares_init_options.3 index f9c8d855..99242598 100644 --- a/docs/ares_init_options.3 +++ b/docs/ares_init_options.3 @@ -230,7 +230,7 @@ The receive buffer size to set for the socket. .B ARES_OPT_EDNSPSZ .B int \fIednspsz\fP; .br -The message size to be advertized in EDNS; only takes effect if the +The message size to be advertised in EDNS; only takes effect if the .B ARES_FLAG_EDNS flag is set. Defaults to 1280, the recommended size. .TP 18 diff --git a/docs/ares_library_init_android.3 b/docs/ares_library_init_android.3 index 7370a8a0..5c8bb753 100644 --- a/docs/ares_library_init_android.3 +++ b/docs/ares_library_init_android.3 @@ -53,7 +53,7 @@ Deinitialization will take place though \fIares_library_cleanup(3)\fP. The \fBares_library_init_jvm\fP function allows the caller to register the JVM with c-ares. It's meant to be called during JNI_OnLoad because you're guaranteed to have the JVM in that function. The JVM is required in order to -use the Connectivty Manager registered using +use the Connectivity Manager registered using \fIares_library_init_android(3)\fP. This must be call before \fIares_library_init_android(3)\fP. @@ -117,7 +117,7 @@ Calling the registered function from Java: } .fi Initializing the Connectivity Manager in JNI directly using an Android -Context. It is assumed the JVM has aleady been registered through +Context. It is assumed the JVM has already been registered through \fIJNI_OnLoad\fP. .nf void initialize(jobject android_context) diff --git a/include/ares.h b/include/ares.h index d5d6ba89..619eec92 100644 --- a/include/ares.h +++ b/include/ares.h @@ -725,7 +725,7 @@ CARES_EXTERN int ares_set_servers_ports(ares_channel_t *channel, const struct ares_addr_port_node *servers); -/* Incomming string format: host[:port][,host[:port]]... */ +/* Incoming string format: host[:port][,host[:port]]... */ CARES_EXTERN int ares_set_servers_csv(ares_channel_t *channel, const char *servers); CARES_EXTERN int ares_set_servers_ports_csv(ares_channel_t *channel, diff --git a/include/ares_dns_record.h b/include/ares_dns_record.h index 86447ff2..2cc16982 100644 --- a/include/ares_dns_record.h +++ b/include/ares_dns_record.h @@ -129,7 +129,7 @@ typedef enum { * not support the requested kind of * query */ ARES_RCODE_REFUSED = 5, /*!< Refused. The name server refuses to - * perform the speciied operation for + * perform the specified operation for * policy reasons. */ ARES_RCODE_YXDOMAIN = 6, /*!< RFC 2136. Some name that ought not to * exist, does exist. */ diff --git a/include/ares_nameser.h b/include/ares_nameser.h index bdc746bd..cf0e3b2d 100644 --- a/include/ares_nameser.h +++ b/include/ares_nameser.h @@ -151,7 +151,7 @@ typedef enum __ns_type { ns_t_cert = 37, /* Certification record */ ns_t_a6 = 38, /* IPv6 address (deprecates AAAA) */ ns_t_dname = 39, /* Non-terminal DNAME (for IPv6) */ - ns_t_sink = 40, /* Kitchen sink (experimentatl) */ + ns_t_sink = 40, /* Kitchen sink (experimental) */ ns_t_opt = 41, /* EDNS0 option (meta-RR) */ ns_t_apl = 42, /* Address prefix list (RFC3123) */ ns_t_ds = 43, /* Delegation Signer (RFC4034) */ diff --git a/maketgz b/maketgz index aa1241f9..e97230b2 100755 --- a/maketgz +++ b/maketgz @@ -60,7 +60,7 @@ print "produce CHANGES\n"; print "running make dist\n"; `make dist VERSION=$version`; -# remove temporay sourced man pages +# remove temporary sourced man pages `make -s clean-sourced-manpages`; print "removing temporary configure.ac file\n"; diff --git a/src/lib/ares__buf.h b/src/lib/ares__buf.h index a36257ef..baa28e06 100644 --- a/src/lib/ares__buf.h +++ b/src/lib/ares__buf.h @@ -119,17 +119,17 @@ ares_status_t ares__buf_append_be32(ares__buf_t *buf, unsigned int u32); * \param[in] buf Initialized buffer object * \param[in] num Number to print * \param[in] len Length to output, use 0 for no padding - * \return ARES_SUCCESS on succeess + * \return ARES_SUCCESS on success */ ares_status_t ares__buf_append_num_dec(ares__buf_t *buf, size_t num, size_t len); -/*! Append a number in ASCII hexidecimal form. +/*! Append a number in ASCII hexadecimal form. * * \param[in] buf Initialized buffer object * \param[in] num Number to print * \param[in] len Length to output, use 0 for no padding - * \return ARES_SUCCESS on succeess + * \return ARES_SUCCESS on success */ ares_status_t ares__buf_append_num_hex(ares__buf_t *buf, size_t num, size_t len); diff --git a/src/lib/ares__htable.c b/src/lib/ares__htable.c index 7e0f5298..51017209 100644 --- a/src/lib/ares__htable.c +++ b/src/lib/ares__htable.c @@ -326,7 +326,7 @@ ares_bool_t ares__htable_insert(ares__htable_t *htable, void *bucket) return ARES_FALSE; } - /* Track collisions for rehash stablility */ + /* Track collisions for rehash stability */ if (ares__llist_len(htable->buckets[idx]) > 1) { htable->num_collisions++; } diff --git a/src/lib/ares__parse_into_addrinfo.c b/src/lib/ares__parse_into_addrinfo.c index aa14022b..308cc214 100644 --- a/src/lib/ares__parse_into_addrinfo.c +++ b/src/lib/ares__parse_into_addrinfo.c @@ -175,7 +175,7 @@ done: ares__freeaddrinfo_nodes(nodes); ares_dns_record_destroy(dnsrec); - /* compatibiltiy */ + /* compatibility */ if (status == ARES_EBADNAME) { status = ARES_EBADRESP; } diff --git a/src/lib/ares__slist.h b/src/lib/ares__slist.h index 9fbff1e9..04cd5080 100644 --- a/src/lib/ares__slist.h +++ b/src/lib/ares__slist.h @@ -181,9 +181,9 @@ void *ares__slist_last_val(ares__slist_t *list); void *ares__slist_node_claim(ares__slist_node_t *node); /*! The internals of the node have changed, thus its position in the sorted - * list is no longer valid. This function will remove it and readd it to the - * proper position without needing to perform any memory allocations and - * thus cannot fail. + * list is no longer valid. This function will remove it and re-add it to + * the proper position without needing to perform any memory allocations + * and thus cannot fail. * * \param[in] node SkipList Node Object */ diff --git a/src/lib/ares_dns_name.c b/src/lib/ares_dns_name.c index 2dd18004..f4085ab2 100644 --- a/src/lib/ares_dns_name.c +++ b/src/lib/ares_dns_name.c @@ -602,7 +602,7 @@ ares_status_t ares__dns_name_parse(ares__buf_t *buf, char **name, /* According to RFC 1035 4.1.4: * In this scheme, an entire domain name or a list of labels at * the end of a domain name is replaced with a pointer to a prior - * occurance of the same name. + * occurrence of the same name. * Note the word "prior", meaning it must go backwards. This was * confirmed via the ISC BIND code that it also prevents forward * pointers. diff --git a/src/lib/ares_dns_parse.c b/src/lib/ares_dns_parse.c index 8d23a601..da26ffdc 100644 --- a/src/lib/ares_dns_parse.c +++ b/src/lib/ares_dns_parse.c @@ -732,7 +732,7 @@ static ares_status_t ares_dns_parse_header(ares__buf_t *buf, unsigned int flags, ares_dns_opcode_t opcode; unsigned short rcode; - (void)flags; /* currently unsed */ + (void)flags; /* currently unused */ if (buf == NULL || dnsrec == NULL || qdcount == NULL || ancount == NULL || nscount == NULL || arcount == NULL) { diff --git a/src/lib/ares_getaddrinfo.c b/src/lib/ares_getaddrinfo.c index 88a06e48..7ee0ab69 100644 --- a/src/lib/ares_getaddrinfo.c +++ b/src/lib/ares_getaddrinfo.c @@ -31,7 +31,7 @@ #ifdef HAVE_GETSERVBYNAME_R # if !defined(GETSERVBYNAME_R_ARGS) || (GETSERVBYNAME_R_ARGS < 4) || \ (GETSERVBYNAME_R_ARGS > 6) -# error "you MUST specifiy a valid number of arguments for getservbyname_r" +# error "you MUST specify a valid number of arguments for getservbyname_r" # endif #endif @@ -238,7 +238,7 @@ static unsigned short lookup_service(const char *service, int flags) return 0; } -/* If the name looks like an IP address or an error occured, +/* If the name looks like an IP address or an error occurred, * fake up a host entry, end the query immediately, and return true. * Otherwise return false. */ diff --git a/src/lib/ares_getnameinfo.c b/src/lib/ares_getnameinfo.c index 6bb012a7..1ec09203 100644 --- a/src/lib/ares_getnameinfo.c +++ b/src/lib/ares_getnameinfo.c @@ -28,7 +28,7 @@ #ifdef HAVE_GETSERVBYPORT_R # if !defined(GETSERVBYPORT_R_ARGS) || (GETSERVBYPORT_R_ARGS < 4) || \ (GETSERVBYPORT_R_ARGS > 6) -# error "you MUST specifiy a valid number of arguments for getservbyport_r" +# error "you MUST specify a valid number of arguments for getservbyport_r" # endif #endif diff --git a/src/lib/ares_math.c b/src/lib/ares_math.c index e0135448..977fb78e 100644 --- a/src/lib/ares_math.c +++ b/src/lib/ares_math.c @@ -27,7 +27,7 @@ #include "ares.h" #include "ares_private.h" -/* Uses public domain code snipets from +/* Uses public domain code snippets from * http://graphics.stanford.edu/~seander/bithacks.html */ size_t ares__round_up_pow2(size_t n) diff --git a/src/lib/ares_search.c b/src/lib/ares_search.c index 3c4aa5fa..216232e9 100644 --- a/src/lib/ares_search.c +++ b/src/lib/ares_search.c @@ -240,7 +240,7 @@ ares_status_t ares__cat_domain(const char *name, const char *domain, char **s) (*s)[nlen] = '.'; if (strcmp(domain, ".") == 0) { /* Avoid appending the root domain to the separator, which would set *s to - an ill-formed value (ending in two consequtive dots). */ + an ill-formed value (ending in two consecutive dots). */ dlen = 0; } memcpy(*s + nlen + 1, domain, dlen); diff --git a/src/lib/ares_strsplit.h b/src/lib/ares_strsplit.h index 71947416..c3e61e17 100644 --- a/src/lib/ares_strsplit.h +++ b/src/lib/ares_strsplit.h @@ -31,9 +31,9 @@ /* Split a string on delms skipping empty or duplicate elements. * * param in String to split. - * param delms String of characters to treat as a delimitor. - * Each character in the string is a delimitor so - * there can be multiple delimitors to split on. + * param delms String of characters to treat as a delimiter. + * Each character in the string is a delimiter so + * there can be multiple delimiters to split on. * E.g. ", " will split on all comma's and spaces. * Duplicate entries are removed. * param num_elm Return parameter of the number of elements diff --git a/src/lib/ares_sysconfig.c b/src/lib/ares_sysconfig.c index bd8428f6..08ab256c 100644 --- a/src/lib/ares_sysconfig.c +++ b/src/lib/ares_sysconfig.c @@ -120,7 +120,7 @@ static ares_bool_t get_REG_SZ(HKEY hKey, const char *leafKeyName, char **outptr) return ARES_FALSE; } - /* Null terminate buffer allways */ + /* Null terminate buffer always */ *(*outptr + size) = '\0'; return ARES_TRUE; @@ -342,7 +342,7 @@ static ares_bool_t get_DNS_Windows(char **outptr) return ARES_FALSE; } - /* Usually this call suceeds with initial buffer size */ + /* Usually this call succeeds with initial buffer size */ res = GetAdaptersAddresses(AF_UNSPEC, AddrFlags, NULL, ipaa, &ReqBufsz); if ((res != ERROR_BUFFER_OVERFLOW) && (res != ERROR_SUCCESS)) { goto done; diff --git a/src/lib/ares_update_servers.c b/src/lib/ares_update_servers.c index 79bdb68e..9ed24601 100644 --- a/src/lib/ares_update_servers.c +++ b/src/lib/ares_update_servers.c @@ -881,7 +881,7 @@ int ares_set_servers_ports(ares_channel_t *channel, return (int)status; } -/* Incomming string format: host[:port][,host[:port]]... */ +/* Incoming string format: host[:port][,host[:port]]... */ /* IPv6 addresses with ports require square brackets [fe80::1]:53 */ static ares_status_t set_servers_csv(ares_channel_t *channel, const char *_csv, int use_port) diff --git a/src/lib/inet_net_pton.c b/src/lib/inet_net_pton.c index 6c8ba12b..19429f20 100644 --- a/src/lib/inet_net_pton.c +++ b/src/lib/inet_net_pton.c @@ -53,9 +53,9 @@ const struct ares_in6_addr ares_in6addr_any = { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, * 0b11110000 in its fourth octet. * note: * On Windows we store the error in the thread errno, not - * in the winsock error code. This is to avoid loosing the + * in the winsock error code. This is to avoid losing the * actual last winsock error. So use macro ERRNO to fetch the - * errno this funtion sets when returning (-1), not SOCKERRNO. + * errno this function sets when returning (-1), not SOCKERRNO. * author: * Paul Vixie (ISC), June 1996 */ @@ -405,9 +405,9 @@ static int ares_inet_net_pton_ipv6(const char *src, unsigned char *dst, * not a valid network specification. * note: * On Windows we store the error in the thread errno, not - * in the winsock error code. This is to avoid loosing the + * in the winsock error code. This is to avoid losing the * actual last winsock error. So use macro ERRNO to fetch the - * errno this funtion sets when returning (-1), not SOCKERRNO. + * errno this function sets when returning (-1), not SOCKERRNO. * author: * Paul Vixie (ISC), June 1996 */ diff --git a/src/lib/inet_ntop.c b/src/lib/inet_ntop.c index 447696e3..8ed49da2 100644 --- a/src/lib/inet_ntop.c +++ b/src/lib/inet_ntop.c @@ -49,7 +49,7 @@ static const char *inet_ntop6(const unsigned char *src, char *dst, size_t size); * pointer to presentation format address (`dst'), or NULL (see errno). * note: * On Windows we store the error in the thread errno, not - * in the winsock error code. This is to avoid loosing the + * in the winsock error code. This is to avoid losing the * actual last winsock error. So use macro ERRNO to fetch the * errno this function sets when returning NULL, not SOCKERRNO. * author: diff --git a/test/ares-test-live.cc b/test/ares-test-live.cc index c0cd364d..28124daf 100644 --- a/test/ares-test-live.cc +++ b/test/ares-test-live.cc @@ -528,7 +528,7 @@ VIRT_NONVIRT_TEST_F(DefaultChannelTest, LiveGetNameInfoV4NotFound) { memset(&sockaddr, 0, sizeof(sockaddr)); sockaddr.sin_family = AF_INET; sockaddr.sin_port = htons(4); // Port 4 unassigned at IANA - // RFC5737 says 192.0.2.0 should not be used publically. + // RFC5737 says 192.0.2.0 should not be used publicly. sockaddr.sin_addr.s_addr = htonl(0xC0000200); ares_getnameinfo(channel_, (const struct sockaddr*)&sockaddr, sizeof(sockaddr), ARES_NI_LOOKUPHOST|ARES_NI_LOOKUPSERVICE|ARES_NI_UDP, @@ -546,7 +546,7 @@ VIRT_NONVIRT_TEST_F(DefaultChannelTest, LiveGetNameInfoV4NotFoundFail) { memset(&sockaddr, 0, sizeof(sockaddr)); sockaddr.sin_family = AF_INET; sockaddr.sin_port = htons(53); - // RFC5737 says 192.0.2.0 should not be used publically. + // RFC5737 says 192.0.2.0 should not be used publicly. sockaddr.sin_addr.s_addr = htonl(0xC0000200); ares_getnameinfo(channel_, (const struct sockaddr*)&sockaddr, sizeof(sockaddr), ARES_NI_LOOKUPHOST|ARES_NI_LOOKUPSERVICE|ARES_NI_UDP|ARES_NI_NAMEREQD,