summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorYang Tse <yangsita@gmail.com>2013-01-03 03:53:06 +0100
committerYang Tse <yangsita@gmail.com>2013-01-03 05:50:26 +0100
commit13606bbfdeaa3bac193e1f39a05a9c9b5f15d1b5 (patch)
tree2213bc5bee29121d23b34de0346ee1324295c379 /lib
parent8f0171bdd498f5febfb9bc93c234c30287227e74 (diff)
downloadcurl-13606bbfdeaa3bac193e1f39a05a9c9b5f15d1b5.tar.gz
build: make use of 93 lib/*.c renamed files
93 *.c source files renamed to use our standard naming scheme. This change affects 77 files in libcurl's source tree.
Diffstat (limited to 'lib')
-rw-r--r--lib/CMakeLists.txt44
-rw-r--r--lib/Makefile.am52
-rw-r--r--lib/Makefile.inc130
-rw-r--r--lib/Makefile.vc6162
-rw-r--r--lib/README.curlx2
-rw-r--r--lib/README.hostip20
-rw-r--r--lib/axtls.c32
-rw-r--r--lib/base64.c4
-rw-r--r--lib/curl_addrinfo.c10
-rw-r--r--lib/curl_asyn.h6
-rw-r--r--lib/curl_darwinssl.c5
-rw-r--r--lib/curl_easyif.h4
-rw-r--r--lib/curl_ftp.h6
-rw-r--r--lib/curl_hostip.h4
-rw-r--r--lib/curl_http.h6
-rw-r--r--lib/curl_imap.h4
-rw-r--r--lib/curl_multiif.h4
-rw-r--r--lib/curl_nssg.h5
-rw-r--r--lib/curl_ntlm_core.c4
-rw-r--r--lib/curl_ntlm_msgs.c4
-rw-r--r--lib/curl_pop3.h4
-rw-r--r--lib/curl_qssl.h5
-rw-r--r--lib/curl_schannel.c4
-rw-r--r--lib/curl_smtp.h4
-rw-r--r--lib/curl_ssh.h4
-rw-r--r--lib/curl_ssluse.h5
-rw-r--r--lib/curl_url.h4
-rw-r--r--lib/curl_urldata.h14
-rw-r--r--lib/cyassl.c4
-rw-r--r--lib/easy.c4
-rw-r--r--lib/escape.c4
-rw-r--r--lib/formdata.c6
-rw-r--r--lib/ftp.c8
-rw-r--r--lib/gtls.c4
-rw-r--r--lib/hostip.c24
-rw-r--r--lib/hostip6.c6
-rw-r--r--lib/http.c20
-rw-r--r--lib/http_chunks.c6
-rw-r--r--lib/http_digest.c4
-rw-r--r--lib/http_proxy.c4
-rw-r--r--lib/imap.c6
-rw-r--r--lib/krb5.c4
-rw-r--r--lib/ldap.c16
-rw-r--r--lib/mprintf.c4
-rw-r--r--lib/multi.c4
-rw-r--r--lib/non-ascii.c8
-rw-r--r--lib/nss.c4
-rw-r--r--lib/openldap.c16
-rw-r--r--lib/pingpong.c4
-rw-r--r--lib/polarssl.c4
-rw-r--r--lib/pop3.c6
-rw-r--r--lib/rtsp.c10
-rw-r--r--lib/sendf.c4
-rw-r--r--lib/smtp.c6
-rw-r--r--lib/ssh.c10
-rw-r--r--lib/ssluse.c6
-rw-r--r--lib/tftp.c4
-rw-r--r--lib/transfer.c6
-rw-r--r--lib/url.c10
59 files changed, 452 insertions, 326 deletions
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 09b976c4c..517ffcfed 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -18,18 +18,18 @@ if(MSVC)
endif()
# SET(CSOURCES
-# # memdebug.c -not used
-# # nwlib.c - Not used
-# # strtok.c - specify later
-# # strtoofft.c - specify later
+# # curl_memdebug.c -not used
+# # curl_nwlib.c - Not used
+# # curl_strtok.c - specify later
+# # curl_strtoofft.c - specify later
# )
# # if we have Kerberos 4, right now this is never on
# #OPTION(CURL_KRB4 "Use Kerberos 4" OFF)
# IF(CURL_KRB4)
# SET(CSOURCES ${CSOURCES}
-# krb4.c
-# security.c
+# curl_krb4.c
+# curl_security.c
# )
# ENDIF(CURL_KRB4)
@@ -37,33 +37,33 @@ endif()
# MARK_AS_ADVANCED(CURL_MALLOC_DEBUG)
# IF(CURL_MALLOC_DEBUG)
# SET(CSOURCES ${CSOURCES}
-# memdebug.c
+# curl_memdebug.c
# )
# ENDIF(CURL_MALLOC_DEBUG)
# # only build compat strtoofft if we need to
# IF(NOT HAVE_STRTOLL AND NOT HAVE__STRTOI64)
# SET(CSOURCES ${CSOURCES}
-# strtoofft.c
+# curl_strtoofft.c
# )
# ENDIF(NOT HAVE_STRTOLL AND NOT HAVE__STRTOI64)
if(HAVE_FEATURES_H)
set_source_files_properties(
- cookie.c
- easy.c
- formdata.c
- getenv.c
- nonblock.c
- hash.c
- http.c
- if2ip.c
- mprintf.c
- multi.c
- sendf.c
- telnet.c
- transfer.c
- url.c
+ curl_cookie.c
+ curl_easy.c
+ curl_formdata.c
+ curl_getenv.c
+ curl_nonblock.c
+ curl_hash.c
+ curl_http.c
+ curl_if2ip.c
+ curl_mprintf.c
+ curl_multi.c
+ curl_sendf.c
+ curl_telnet.c
+ curl_transfer.c
+ curl_url.c
COMPILE_FLAGS -D_BSD_SOURCE)
endif(HAVE_FEATURES_H)
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 39fb4ff75..11256811e 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -5,7 +5,7 @@
# | (__| |_| | _ <| |___
# \___|\___/|_| \_\_____|
#
-# Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
+# Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
#
# This software is licensed as described in the file COPYING, which
# you should have received as part of this distribution. The terms
@@ -30,16 +30,46 @@ DOCS = README.encoding README.memoryleak README.ares README.curlx \
CMAKE_DIST = CMakeLists.txt curl_config.h.cmake
-EXTRA_DIST = Makefile.b32 Makefile.m32 Makefile.vc6 $(DSP) \
- vc6libcurl.dsw config-win32.h config-win32ce.h config-riscos.h \
- config-mac.h curl_config.h.in makefile.dj config-dos.h libcurl.plist \
- libcurl.rc config-amigaos.h makefile.amiga \
- Makefile.netware nwlib.c nwos.c msvcproj.head msvcproj.foot \
- config-win32ce.h config-os400.h setup-os400.h config-symbian.h \
- Makefile.Watcom config-tpf.h $(DOCS) $(VCPROJ) mk-ca-bundle.pl \
- mk-ca-bundle.vbs firefox-db2pem.sh $(CMAKE_DIST) config-vxworks.h \
- Makefile.vxworks config-vms.h checksrc.pl objnames-test.sh \
- objnames.inc
+EXTRA_DIST = \
+ $(CMAKE_DIST) \
+ $(DOCS) \
+ $(DSP) \
+ $(VCPROJ) \
+ Makefile.Watcom \
+ Makefile.b32 \
+ Makefile.m32 \
+ Makefile.netware \
+ Makefile.vc6 \
+ Makefile.vxworks \
+ checksrc.pl \
+ config-amigaos.h \
+ config-dos.h \
+ config-mac.h \
+ config-os400.h \
+ config-riscos.h \
+ config-symbian.h \
+ config-tpf.h \
+ config-vms.h \
+ config-vxworks.h \
+ config-win32.h \
+ config-win32ce.h \
+ config-win32ce.h \
+ curl_config.h.in \
+ curl_nwlib.c \
+ curl_nwos.c \
+ firefox-db2pem.sh \
+ libcurl.plist \
+ libcurl.rc \
+ makefile.amiga \
+ makefile.dj \
+ mk-ca-bundle.pl \
+ mk-ca-bundle.vbs \
+ msvcproj.foot \
+ msvcproj.head \
+ objnames-test.sh \
+ objnames.inc \
+ setup-os400.h \
+ vc6libcurl.dsw
CLEANFILES = $(DSP) $(VCPROJ)
diff --git a/lib/Makefile.inc b/lib/Makefile.inc
index 115dd4487..27658639e 100644
--- a/lib/Makefile.inc
+++ b/lib/Makefile.inc
@@ -7,25 +7,115 @@
# CSRC2 = file4.c file5.c file6.c
# CSOURCES = $(CSRC1) $(CSRC2)
-CSOURCES = file.c timeval.c base64.c hostip.c progress.c formdata.c \
- cookie.c http.c sendf.c ftp.c url.c dict.c if2ip.c speedcheck.c \
- ldap.c ssluse.c version.c getenv.c escape.c mprintf.c telnet.c \
- netrc.c getinfo.c transfer.c strequal.c easy.c security.c krb4.c \
- curl_fnmatch.c fileinfo.c ftplistparser.c wildcard.c krb5.c \
- memdebug.c http_chunks.c strtok.c connect.c llist.c hash.c multi.c \
- content_encoding.c share.c http_digest.c md4.c md5.c curl_rand.c \
- http_negotiate.c inet_pton.c strtoofft.c strerror.c amigaos.c \
- hostasyn.c hostip4.c hostip6.c hostsyn.c inet_ntop.c parsedate.c \
- select.c gtls.c sslgen.c tftp.c splay.c strdup.c socks.c ssh.c nss.c \
- qssl.c rawstr.c curl_addrinfo.c socks_gssapi.c socks_sspi.c \
- curl_sspi.c slist.c nonblock.c curl_memrchr.c imap.c pop3.c smtp.c \
- pingpong.c rtsp.c curl_threads.c warnless.c hmac.c polarssl.c \
- curl_rtmp.c openldap.c curl_gethostname.c gopher.c axtls.c \
- idn_win32.c http_negotiate_sspi.c cyassl.c http_proxy.c non-ascii.c \
- asyn-ares.c asyn-thread.c curl_gssapi.c curl_ntlm.c curl_ntlm_wb.c \
- curl_ntlm_core.c curl_ntlm_msgs.c curl_sasl.c curl_schannel.c \
- curl_multibyte.c curl_darwinssl.c hostcheck.c \
- bundles.c conncache.c
+CSOURCES = \
+ curl_amigaos.c \
+ curl_asyn_ares.c \
+ curl_asyn_thread.c \
+ curl_axtls.c \
+ curl_base64.c \
+ curl_bundles.c \
+ curl_conncache.c \
+ curl_connect.c \
+ curl_content_encoding.c \
+ curl_cookie.c \
+ curl_addrinfo.c \
+ curl_darwinssl.c \
+ curl_fnmatch.c \
+ curl_gethostname.c \
+ curl_gssapi.c \
+ curl_memrchr.c \
+ curl_multibyte.c \
+ curl_ntlm.c \
+ curl_ntlm_core.c \
+ curl_ntlm_msgs.c \
+ curl_ntlm_wb.c \
+ curl_rand.c \
+ curl_rtmp.c \
+ curl_sasl.c \
+ curl_schannel.c \
+ curl_sspi.c \
+ curl_threads.c \
+ curl_cyassl.c \
+ curl_dict.c \
+ curl_easy.c \
+ curl_escape.c \
+ curl_file.c \
+ curl_fileinfo.c \
+ curl_formdata.c \
+ curl_ftp.c \
+ curl_ftplistparser.c \
+ curl_getenv.c \
+ curl_getinfo.c \
+ curl_gopher.c \
+ curl_gtls.c \
+ curl_hash.c \
+ curl_hmac.c \
+ curl_hostasyn.c \
+ curl_hostcheck.c \
+ curl_hostip.c \
+ curl_hostip4.c \
+ curl_hostip6.c \
+ curl_hostsyn.c \
+ curl_http.c \
+ curl_http_chunks.c \
+ curl_http_digest.c \
+ curl_http_negotiate.c \
+ curl_http_negotiate_sspi.c \
+ curl_http_proxy.c \
+ curl_idn_win32.c \
+ curl_if2ip.c \
+ curl_imap.c \
+ curl_inet_ntop.c \
+ curl_inet_pton.c \
+ curl_krb4.c \
+ curl_krb5.c \
+ curl_ldap.c \
+ curl_llist.c \
+ curl_md4.c \
+ curl_md5.c \
+ curl_memdebug.c \
+ curl_mprintf.c \
+ curl_multi.c \
+ curl_netrc.c \
+ curl_non_ascii.c \
+ curl_nonblock.c \
+ curl_nss.c \
+ curl_openldap.c \
+ curl_parsedate.c \
+ curl_pingpong.c \
+ curl_polarssl.c \
+ curl_pop3.c \
+ curl_progress.c \
+ curl_qssl.c \
+ curl_rawstr.c \
+ curl_rtsp.c \
+ curl_security.c \
+ curl_select.c \
+ curl_sendf.c \
+ curl_share.c \
+ curl_slist.c \
+ curl_smtp.c \
+ curl_socks.c \
+ curl_socks_gssapi.c \
+ curl_socks_sspi.c \
+ curl_speedcheck.c \
+ curl_splay.c \
+ curl_ssh.c \
+ curl_sslgen.c \
+ curl_ssluse.c \
+ curl_strdup.c \
+ curl_strequal.c \
+ curl_strerror.c \
+ curl_strtok.c \
+ curl_strtoofft.c \
+ curl_telnet.c \
+ curl_tftp.c \
+ curl_timeval.c \
+ curl_transfer.c \
+ curl_url.c \
+ curl_version.c \
+ curl_warnless.c \
+ curl_wildcard.c
HHEADERS = \
curl_addrinfo.h \
@@ -79,7 +169,7 @@ HHEADERS = \
curl_multibyte.h \
curl_multiif.h \
curl_netrc.h \
- curl_non-ascii.h \
+ curl_non_ascii.h \
curl_nonblock.h \
curl_nssg.h \
curl_ntlm.h \
diff --git a/lib/Makefile.vc6 b/lib/Makefile.vc6
index a8e7741b9..99a158f32 100644
--- a/lib/Makefile.vc6
+++ b/lib/Makefile.vc6
@@ -5,7 +5,7 @@
# | (__| |_| | _ <| |___
# \___|\___/|_| \_\_____|
#
-# Copyright (C) 1999 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
+# Copyright (C) 1999 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
#
# This software is licensed as described in the file COPYING, which
# you should have received as part of this distribution. The terms
@@ -494,14 +494,14 @@ clean:
# A config was provided, so the library can be built.
#
X_OBJS= \
- $(DIROBJ)\asyn-ares.obj \
- $(DIROBJ)\asyn-thread.obj \
- $(DIROBJ)\base64.obj \
- $(DIROBJ)\bundles.obj \
- $(DIROBJ)\conncache.obj \
- $(DIROBJ)\connect.obj \
- $(DIROBJ)\content_encoding.obj \
- $(DIROBJ)\cookie.obj \
+ $(DIROBJ)\curl_asyn_ares.obj \
+ $(DIROBJ)\curl_asyn_thread.obj \
+ $(DIROBJ)\curl_base64.obj \
+ $(DIROBJ)\curl_bundles.obj \
+ $(DIROBJ)\curl_conncache.obj \
+ $(DIROBJ)\curl_connect.obj \
+ $(DIROBJ)\curl_content_encoding.obj \
+ $(DIROBJ)\curl_cookie.obj \
$(DIROBJ)\curl_addrinfo.obj \
$(DIROBJ)\curl_darwinssl.obj \
$(DIROBJ)\curl_fnmatch.obj \
@@ -518,78 +518,78 @@ X_OBJS= \
$(DIROBJ)\curl_schannel.obj \
$(DIROBJ)\curl_sspi.obj \
$(DIROBJ)\curl_threads.obj \
- $(DIROBJ)\dict.obj \
- $(DIROBJ)\easy.obj \
- $(DIROBJ)\escape.obj \
- $(DIROBJ)\file.obj \
- $(DIROBJ)\fileinfo.obj \
- $(DIROBJ)\formdata.obj \
- $(DIROBJ)\ftp.obj \
- $(DIROBJ)\ftplistparser.obj \
- $(DIROBJ)\getenv.obj \
- $(DIROBJ)\getinfo.obj \
- $(DIROBJ)\gopher.obj \
- $(DIROBJ)\gtls.obj \
- $(DIROBJ)\hash.obj \
- $(DIROBJ)\hmac.obj \
- $(DIROBJ)\hostasyn.obj \
- $(DIROBJ)\hostcheck.obj \
- $(DIROBJ)\hostip.obj \
- $(DIROBJ)\hostip4.obj \
- $(DIROBJ)\hostip6.obj \
- $(DIROBJ)\hostsyn.obj \
- $(DIROBJ)\http.obj \
- $(DIROBJ)\http_chunks.obj \
- $(DIROBJ)\http_digest.obj \
- $(DIROBJ)\http_negotiate.obj \
- $(DIROBJ)\http_negotiate_sspi.obj \
- $(DIROBJ)\http_proxy.obj \
- $(DIROBJ)\if2ip.obj \
- $(DIROBJ)\imap.obj \
- $(DIROBJ)\inet_ntop.obj \
- $(DIROBJ)\inet_pton.obj \
- $(DIROBJ)\ldap.obj \
- $(DIROBJ)\llist.obj \
- $(DIROBJ)\md4.obj \
- $(DIROBJ)\md5.obj \
- $(DIROBJ)\memdebug.obj \
- $(DIROBJ)\mprintf.obj \
- $(DIROBJ)\multi.obj \
- $(DIROBJ)\netrc.obj \
- $(DIROBJ)\nonblock.obj \
- $(DIROBJ)\openldap.obj \
- $(DIROBJ)\parsedate.obj \
- $(DIROBJ)\pingpong.obj \
- $(DIROBJ)\polarssl.obj \
- $(DIROBJ)\pop3.obj \
- $(DIROBJ)\progress.obj \
- $(DIROBJ)\rawstr.obj \
- $(DIROBJ)\rtsp.obj \
- $(DIROBJ)\select.obj \
- $(DIROBJ)\sendf.obj \
- $(DIROBJ)\share.obj \
- $(DIROBJ)\slist.obj \
- $(DIROBJ)\smtp.obj \
- $(DIROBJ)\socks.obj \
- $(DIROBJ)\socks_gssapi.obj \
- $(DIROBJ)\socks_sspi.obj \
- $(DIROBJ)\speedcheck.obj \
- $(DIROBJ)\splay.obj \
- $(DIROBJ)\ssh.obj \
- $(DIROBJ)\sslgen.obj \
- $(DIROBJ)\ssluse.obj \
- $(DIROBJ)\strequal.obj \
- $(DIROBJ)\strerror.obj \
- $(DIROBJ)\strtok.obj \
- $(DIROBJ)\strtoofft.obj \
- $(DIROBJ)\telnet.obj \
- $(DIROBJ)\tftp.obj \
- $(DIROBJ)\timeval.obj \
- $(DIROBJ)\transfer.obj \
- $(DIROBJ)\url.obj \
- $(DIROBJ)\version.obj \
- $(DIROBJ)\warnless.obj \
- $(DIROBJ)\wildcard.obj \
+ $(DIROBJ)\curl_dict.obj \
+ $(DIROBJ)\curl_easy.obj \
+ $(DIROBJ)\curl_escape.obj \
+ $(DIROBJ)\curl_file.obj \
+ $(DIROBJ)\curl_fileinfo.obj \
+ $(DIROBJ)\curl_formdata.obj \
+ $(DIROBJ)\curl_ftp.obj \
+ $(DIROBJ)\curl_ftplistparser.obj \
+ $(DIROBJ)\curl_getenv.obj \
+ $(DIROBJ)\curl_getinfo.obj \
+ $(DIROBJ)\curl_gopher.obj \
+ $(DIROBJ)\curl_gtls.obj \
+ $(DIROBJ)\curl_hash.obj \
+ $(DIROBJ)\curl_hmac.obj \
+ $(DIROBJ)\curl_hostasyn.obj \
+ $(DIROBJ)\curl_hostcheck.obj \
+ $(DIROBJ)\curl_hostip.obj \
+ $(DIROBJ)\curl_hostip4.obj \
+ $(DIROBJ)\curl_hostip6.obj \
+ $(DIROBJ)\curl_hostsyn.obj \
+ $(DIROBJ)\curl_http.obj \
+ $(DIROBJ)\curl_http_chunks.obj \
+ $(DIROBJ)\curl_http_digest.obj \
+ $(DIROBJ)\curl_http_negotiate.obj \
+ $(DIROBJ)\curl_http_negotiate_sspi.obj \
+ $(DIROBJ)\curl_http_proxy.obj \
+ $(DIROBJ)\curl_if2ip.obj \
+ $(DIROBJ)\curl_imap.obj \
+ $(DIROBJ)\curl_inet_ntop.obj \
+ $(DIROBJ)\curl_inet_pton.obj \
+ $(DIROBJ)\curl_ldap.obj \
+ $(DIROBJ)\curl_llist.obj \
+ $(DIROBJ)\curl_md4.obj \
+ $(DIROBJ)\curl_md5.obj \
+ $(DIROBJ)\curl_memdebug.obj \
+ $(DIROBJ)\curl_mprintf.obj \
+ $(DIROBJ)\curl_multi.obj \
+ $(DIROBJ)\curl_netrc.obj \
+ $(DIROBJ)\curl_nonblock.obj \
+ $(DIROBJ)\curl_openldap.obj \
+ $(DIROBJ)\curl_parsedate.obj \
+ $(DIROBJ)\curl_pingpong.obj \
+ $(DIROBJ)\curl_polarssl.obj \
+ $(DIROBJ)\curl_pop3.obj \
+ $(DIROBJ)\curl_progress.obj \
+ $(DIROBJ)\curl_rawstr.obj \
+ $(DIROBJ)\curl_rtsp.obj \
+ $(DIROBJ)\curl_select.obj \
+ $(DIROBJ)\curl_sendf.obj \
+ $(DIROBJ)\curl_share.obj \
+ $(DIROBJ)\curl_slist.obj \
+ $(DIROBJ)\curl_smtp.obj \
+ $(DIROBJ)\curl_socks.obj \
+ $(DIROBJ)\curl_socks_gssapi.obj \
+ $(DIROBJ)\curl_socks_sspi.obj \
+ $(DIROBJ)\curl_speedcheck.obj \
+ $(DIROBJ)\curl_splay.obj \
+ $(DIROBJ)\curl_ssh.obj \
+ $(DIROBJ)\curl_sslgen.obj \
+ $(DIROBJ)\curl_ssluse.obj \
+ $(DIROBJ)\curl_strequal.obj \
+ $(DIROBJ)\curl_strerror.obj \
+ $(DIROBJ)\curl_strtok.obj \
+ $(DIROBJ)\curl_strtoofft.obj \
+ $(DIROBJ)\curl_telnet.obj \
+ $(DIROBJ)\curl_tftp.obj \
+ $(DIROBJ)\curl_timeval.obj \
+ $(DIROBJ)\curl_transfer.obj \
+ $(DIROBJ)\curl_url.obj \
+ $(DIROBJ)\curl_version.obj \
+ $(DIROBJ)\curl_warnless.obj \
+ $(DIROBJ)\curl_wildcard.obj \
$(RESOURCE)
all : $(TARGET)
diff --git a/lib/README.curlx b/lib/README.curlx
index 5375b0d1d..6d6e29ec9 100644
--- a/lib/README.curlx
+++ b/lib/README.curlx
@@ -19,7 +19,7 @@ We provide them through a single header file for easy access for apps:
A macro that converts a string containing a number to a curl_off_t number.
This might use the curlx_strtoll() function which is provided as source
- code in strtoofft.c. Note that the function is only provided if no
+ code in curl_strtoofft.c. Note that the function is only provided if no
strtoll() (or equivalent) function exist on your platform. If curl_off_t
is only a 32 bit number on your platform, this macro uses strtol().
diff --git a/lib/README.hostip b/lib/README.hostip
index a87dab45a..890187187 100644
--- a/lib/README.hostip
+++ b/lib/README.hostip
@@ -1,7 +1,7 @@
- hostip.c explained
+ curl_hostip.c explained
==================
- The main COMPILE-TIME DEFINES to keep in mind when reading the host*.c
+ The main COMPILE-TIME DEFINES to keep in mind when reading the curl_host*.c
source file are these:
CURLRES_IPV6 - this host has getaddrinfo() and family, and thus we use
@@ -21,15 +21,15 @@
libcurl is not built to use an asynchronous resolver, CURLRES_SYNCH is
defined.
- The host*.c sources files are split up like this:
+ The curl_host*.c sources files are split up like this:
- hostip.c - method-independent resolver functions and utility functions
- hostasyn.c - functions for asynchronous name resolves
- hostsyn.c - functions for synchronous name resolves
- hostares.c - functions for ares-using name resolves
- hostthre.c - functions for threaded name resolves
- hostip4.c - ipv4-specific functions
- hostip6.c - ipv6-specific functions
+ curl_hostip.c - method-independent resolver functions and utility functions
+ curl_hostasyn.c - functions for asynchronous name resolves
+ curl_hostsyn.c - functions for synchronous name resolves
+ curl_hostares.c - functions for ares-using name resolves
+ curl_hostthre.c - functions for threaded name resolves
+ curl_hostip4.c - ipv4-specific functions
+ curl_hostip6.c - ipv6-specific functions
The curl_hostip.h is the single united header file for all this. It defines
the CURLRES_* defines based on the config*.h and curl_setup.h defines.
diff --git a/lib/axtls.c b/lib/axtls.c
index 3a29cc200..8bd606a40 100644
--- a/lib/axtls.c
+++ b/lib/axtls.c
@@ -5,8 +5,8 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 2010, DirecTV
- * contact: Eric Hu <ehu@directv.com>
+ * Copyright (C) 2010, DirecTV * contact: Eric Hu <ehu@directv.com>
+ * Copyright (C) 2010 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -23,7 +23,7 @@
/*
* Source file for all axTLS-specific code for the TLS/SSL layer. No code
- * but sslgen.c should ever call or use these functions.
+ * but curl_sslgen.c should ever call or use these functions.
*/
#include "curl_setup.h"
@@ -199,7 +199,7 @@ Curl_axtls_connect(struct connectdata *conn,
infof(data, "found certificates in %s\n", data->set.ssl.CAfile);
}
- /* gtls.c tasks we're skipping for now:
+ /* curl_gtls.c tasks we're skipping for now:
* 1) certificate revocation list checking
* 2) dns name assignment to host
* 3) set protocol priority. axTLS is TLSv1 only, so can probably ignore
@@ -255,7 +255,7 @@ Curl_axtls_connect(struct connectdata *conn,
}
}
- /* gtls.c does more here that is being left out for now
+ /* curl_gtls.c does more here that is being left out for now
* 1) set session credentials. can probably ignore since axtls puts this
* info in the ssl_ctx struct
* 2) setting up callbacks. these seem gnutls specific
@@ -280,7 +280,7 @@ Curl_axtls_connect(struct connectdata *conn,
}
infof (data, "handshake completed successfully\n");
- /* Here, gtls.c gets the peer certificates and fails out depending on
+ /* Here, curl_gtls.c gets the peer certificates and fails out depending on
* settings in "data." axTLS api doesn't have get cert chain fcn, so omit?
*/
@@ -295,10 +295,10 @@ Curl_axtls_connect(struct connectdata *conn,
else
infof(data, "\t server certificate verification SKIPPED\n");
- /* Here, gtls.c does issuer verification. axTLS has no straightforward
+ /* Here, curl_gtls.c does issuer verification. axTLS has no straightforward
* equivalent, so omitting for now.*/
- /* Here, gtls.c does the following
+ /* Here, curl_gtls.c does the following
* 1) x509 hostname checking per RFC2818. axTLS doesn't support this, but
* it seems useful. This is now implemented, by Oscar Koeroo
* 2) checks cert validity based on time. axTLS does this in ssl_verify_cert
@@ -408,10 +408,10 @@ void Curl_axtls_close(struct connectdata *conn, int sockindex)
infof(conn->data, " Curl_axtls_close\n");
if(connssl->ssl) {
- /* line from ssluse.c: (void)SSL_shutdown(connssl->ssl);
+ /* line from curl_ssluse.c: (void)SSL_shutdown(connssl->ssl);
axTLS compat layer does nothing for SSL_shutdown */
- /* The following line is from ssluse.c. There seems to be no axTLS
+ /* The following line is from curl_ssluse.c. There seems to be no axTLS
equivalent. ssl_free and ssl_ctx_free close things.
SSL_set_connect_state(connssl->handle); */
@@ -430,8 +430,9 @@ void Curl_axtls_close(struct connectdata *conn, int sockindex)
*/
int Curl_axtls_shutdown(struct connectdata *conn, int sockindex)
{
- /* Outline taken from ssluse.c since functions are in axTLS compat layer.
- axTLS's error set is much smaller, so a lot of error-handling was removed.
+ /* Outline taken from curl_ssluse.c since functions are in axTLS compat
+ layer. axTLS's error set is much smaller, so a lot of error-handling
+ was removed.
*/
int retval = 0;
struct ssl_connect_data *connssl = &conn->ssl[sockindex];
@@ -521,7 +522,8 @@ static ssize_t axtls_recv(struct connectdata *conn, /* connection data */
*/
int Curl_axtls_check_cxn(struct connectdata *conn)
{
- /* ssluse.c line: rc = SSL_peek(conn->ssl[FIRSTSOCKET].ssl, (void*)&buf, 1);
+ /* curl_ssluse.c line:
+ rc = SSL_peek(conn->ssl[FIRSTSOCKET].ssl, (void*)&buf, 1);
axTLS compat layer always returns the last argument, so connection is
always alive? */
@@ -533,8 +535,8 @@ void Curl_axtls_session_free(void *ptr)
{
(void)ptr;
/* free the ID */
- /* both ssluse.c and gtls.c do something here, but axTLS's OpenSSL
- compatibility layer does nothing, so we do nothing too. */
+ /* both curl_ssluse.c and curl_gtls.c do something here, but axTLS's
+ OpenSSL compatibility layer does nothing, so we do nothing too. */
}
size_t Curl_axtls_version(char *buffer, size_t size)
diff --git a/lib/base64.c b/lib/base64.c
index 3b90ee17a..45c7a95bc 100644
--- a/lib/base64.c
+++ b/lib/base64.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -31,7 +31,7 @@
#include "curl_warnless.h"
#include "curl_base64.h"
#include "curl_memory.h"
-#include "curl_non-ascii.h"
+#include "curl_non_ascii.h"
/* include curl_memdebug.h last */
#include "curl_memdebug.h"
diff --git a/lib/curl_addrinfo.c b/lib/curl_addrinfo.c
index 6cf7076f6..c2d5832e6 100644
--- a/lib/curl_addrinfo.c
+++ b/lib/curl_addrinfo.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -482,8 +482,8 @@ Curl_addrinfo *Curl_str2addr(char *address, int port)
* curl_dofreeaddrinfo()
*
* This is strictly for memory tracing and are using the same style as the
- * family otherwise present in memdebug.c. I put these ones here since they
- * require a bunch of structs I didn't want to include in memdebug.c
+ * family otherwise present in curl_memdebug.c. I put these ones here since
+ * they require a bunch of structs I didn't want to include there.
*/
void
@@ -502,8 +502,8 @@ curl_dofreeaddrinfo(struct addrinfo *freethis,
* curl_dogetaddrinfo()
*
* This is strictly for memory tracing and are using the same style as the
- * family otherwise present in memdebug.c. I put these ones here since they
- * require a bunch of structs I didn't want to include in memdebug.c
+ * family otherwise present in curl_memdebug.c. I put these ones here since
+ * they require a bunch of structs I didn't want to include there.
*/
int
diff --git a/lib/curl_asyn.h b/lib/curl_asyn.h
index 1b681ea12..1167a3159 100644
--- a/lib/curl_asyn.h
+++ b/lib/curl_asyn.h
@@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -34,8 +34,8 @@ struct Curl_dns_entry;
/*
* This header defines all functions in the internal asynch resolver interface.
* All asynch resolvers need to provide these functions.
- * asyn-ares.c and asyn-thread.c are the current implementations of asynch
- * resolver backends.
+ * curl_asyn_ares.c and curl_asyn_thread.c are the current implementations of
+ * asynch resolver backends.
*/
/*
diff --git a/lib/curl_darwinssl.c b/lib/curl_darwinssl.c
index 04067d167..b919c1680 100644
--- a/lib/curl_darwinssl.c
+++ b/lib/curl_darwinssl.c
@@ -6,7 +6,7 @@
* \___|\___/|_| \_\_____|
*
* Copyright (C) 2012, Nick Zitzmann, <nickzman@gmail.com>.
- * Copyright (C) 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 2012 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -23,7 +23,8 @@
/*
* Source file for all iOS and Mac OS X SecureTransport-specific code for the
- * TLS/SSL layer. No code but sslgen.c should ever call or use these functions.
+ * TLS/SSL layer. No code but curl_sslgen.c should ever call or use these
+ * functions.
*/
#include "curl_setup.h"
diff --git a/lib/curl_easyif.h b/lib/curl_easyif.h
index 1f521689f..ed744db08 100644
--- a/lib/curl_easyif.h
+++ b/lib/curl_easyif.h
@@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -23,7 +23,7 @@
***************************************************************************/
/*
- * Prototypes for library-wide functions provided by easy.c
+ * Prototypes for library-wide functions provided by curl_easy.c
*/
void Curl_easy_addmulti(struct SessionHandle *data, void *multi);
diff --git a/lib/curl_ftp.h b/lib/curl_ftp.h
index 6b75ac96c..7e5026792 100644
--- a/lib/curl_ftp.h
+++ b/lib/curl_ftp.h
@@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -79,7 +79,7 @@ typedef enum {
FTP_LAST /* never used */
} ftpstate;
-struct ftp_parselist_data; /* defined later in ftplistparser.c */
+struct ftp_parselist_data; /* defined later in curl_ftplistparser.c */
struct ftp_wc_tmpdata {
struct ftp_parselist_data *parser;
@@ -146,7 +146,7 @@ struct ftp_conn {
int count1; /* general purpose counter for the state machine */
int count2; /* general purpose counter for the state machine */
int count3; /* general purpose counter for the state machine */
- ftpstate state; /* always use ftp.c:state() to change state! */
+ ftpstate state; /* always use curl_ftp.c:state() to change state! */
ftpstate state_saved; /* transfer type saved to be reloaded after
data connection is established */
curl_off_t retr_size_saved; /* Size of retrieved file saved */
diff --git a/lib/curl_hostip.h b/lib/curl_hostip.h
index fb32d74fe..30c738d72 100644
--- a/lib/curl_hostip.h
+++ b/lib/curl_hostip.h
@@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -187,7 +187,7 @@ Curl_cache_addr(struct SessionHandle *data, Curl_addrinfo *addr,
#endif
#ifdef HAVE_SIGSETJMP
-/* Forward-declaration of variable defined in hostip.c. Beware this
+/* Forward-declaration of variable defined in curl_hostip.c. Beware this
* is a global and unique instance. This is used to store the return
* address that we can jump back to from inside a signal handler.
* This is not thread-safe stuff.
diff --git a/lib/curl_http.h b/lib/curl_http.h
index 7236dd88c..f654689d5 100644
--- a/lib/curl_http.h
+++ b/lib/curl_http.h
@@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -67,12 +67,12 @@ CURLcode Curl_http(struct connectdata *conn, bool *done);
CURLcode Curl_http_done(struct connectdata *, CURLcode, bool premature);
CURLcode Curl_http_connect(struct connectdata *conn, bool *done);
-/* The following functions are defined in http_chunks.c */
+/* The following functions are defined in curl_http_chunks.c */
void Curl_httpchunk_init(struct connectdata *conn);
CHUNKcode Curl_httpchunk_read(struct connectdata *conn, char *datap,
ssize_t length, ssize_t *wrote);
-/* These functions are in http.c */
+/* These functions are in curl_http.c */
void Curl_http_auth_stage(struct SessionHandle *data, int stage);
CURLcode Curl_http_input_auth(struct connectdata *conn,
int httpcode, const char *header);
diff --git a/lib/curl_imap.h b/lib/curl_imap.h
index ba6fe93ae..62fb126a5 100644
--- a/lib/curl_imap.h
+++ b/lib/curl_imap.h
@@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 2009 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 2009 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -46,7 +46,7 @@ typedef enum {
struct imap_conn {
struct pingpong pp;
char *mailbox; /* Message ID to fetch */
- imapstate state; /* Always use imap.c:state() to change state! */
+ imapstate state; /* Always use curl_imap.c:state() to change state! */
int cmdid; /* Next command ID */
const char *idstr; /* String based response ID to wait for */
bool ssldone; /* Is connect() over SSL done? Only relevant in
diff --git a/lib/curl_multiif.h b/lib/curl_multiif.h
index c84b6184c..6e5881e2d 100644
--- a/lib/curl_multiif.h
+++ b/lib/curl_multiif.h
@@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -23,7 +23,7 @@
***************************************************************************/
/*
- * Prototypes for library-wide functions provided by multi.c
+ * Prototypes for library-wide functions provided by curl_multi.c
*/
void Curl_expire(struct SessionHandle *data, long milli);
diff --git a/lib/curl_nssg.h b/lib/curl_nssg.h
index c98c37f14..3ba75d351 100644
--- a/lib/curl_nssg.h
+++ b/lib/curl_nssg.h
@@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -25,7 +25,8 @@
#ifdef USE_NSS
/*
- * This header should only be needed to get included by sslgen.c and nss.c
+ * This header should only be needed to get included by curl_sslgen.c and
+ * curl_nss.c
*/
#include "curl_urldata.h"
diff --git a/lib/curl_ntlm_core.c b/lib/curl_ntlm_core.c
index ebd6e304b..9c1fdf98c 100644
--- a/lib/curl_ntlm_core.c
+++ b/lib/curl_ntlm_core.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -92,7 +92,7 @@
#endif
#include "curl_urldata.h"
-#include "curl_non-ascii.h"
+#include "curl_non_ascii.h"
#include "curl_rawstr.h"
#include "curl_memory.h"
#include "curl_ntlm_core.h"
diff --git a/lib/curl_ntlm_msgs.c b/lib/curl_ntlm_msgs.c
index e625a06c4..18a7304a2 100644
--- a/lib/curl_ntlm_msgs.c
+++ b/lib/curl_ntlm_msgs.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -34,7 +34,7 @@
#define DEBUG_ME 0
#include "curl_urldata.h"
-#include "curl_non-ascii.h"
+#include "curl_non_ascii.h"
#include "curl_sendf.h"
#include "curl_base64.h"
#include "curl_ntlm_core.h"
diff --git a/lib/curl_pop3.h b/lib/curl_pop3.h
index 1b6859955..62b88fdac 100644
--- a/lib/curl_pop3.h
+++ b/lib/curl_pop3.h
@@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 2009 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 2009 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -62,7 +62,7 @@ struct pop3_conn {
unsigned int authmechs; /* Accepted SASL authentication mechanisms */
unsigned int authused; /* SASL auth mechanism used for the connection */
char *apoptimestamp; /* APOP timestamp from the server greeting */
- pop3state state; /* Always use pop3.c:state() to change state! */
+ pop3state state; /* Always use curl_pop3.c:state() to change state */
};
extern const struct Curl_handler Curl_handler_pop3;
diff --git a/lib/curl_qssl.h b/lib/curl_qssl.h
index 3801a1185..3a7cc5045 100644
--- a/lib/curl_qssl.h
+++ b/lib/curl_qssl.h
@@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -24,7 +24,8 @@
#include "curl_setup.h"
/*
- * This header should only be needed to get included by sslgen.c and qssl.c
+ * This header should only be needed to get included by curl_sslgen.c and
+ * curl_qssl.c
*/
#include "curl_urldata.h"
diff --git a/lib/curl_schannel.c b/lib/curl_schannel.c
index 3bbebec8a..06095d719 100644
--- a/lib/curl_schannel.c
+++ b/lib/curl_schannel.c
@@ -7,7 +7,7 @@
*
* Copyright (C) 2012, Marc Hoersken, <info@marc-hoersken.de>, et al.
* Copyright (C) 2012, Mark Salisbury, <mark.salisbury@hp.com>
- * Copyright (C) 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 2012 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -24,7 +24,7 @@
/*
* Source file for all SChannel-specific code for the TLS/SSL layer. No code
- * but sslgen.c should ever call or use these functions.
+ * but curl_sslgen.c should ever call or use these functions.
*
*/
diff --git a/lib/curl_smtp.h b/lib/curl_smtp.h
index 7a3ced588..d92547c11 100644
--- a/lib/curl_smtp.h
+++ b/lib/curl_smtp.h
@@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 2009 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 2009 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -62,7 +62,7 @@ struct smtp_conn {
have been received so far */
unsigned int authmechs; /* Accepted authentication mechanisms */
unsigned int authused; /* Auth mechanism used for the connection */
- smtpstate state; /* Always use smtp.c:state() to change state! */
+ smtpstate state; /* Always use curl_smtp.c:state() to change */
struct curl_slist *rcpt; /* Recipient list */
bool ssldone; /* Is connect() over SSL done? Only relevant in
multi mode */
diff --git a/lib/curl_ssh.h b/lib/curl_ssh.h
index ff2e16be9..c7f1a9c69 100644
--- a/lib/curl_ssh.h
+++ b/lib/curl_ssh.h
@@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -111,7 +111,7 @@ struct ssh_conn {
char *rsa_pub; /* path name */
char *rsa; /* path name */
bool authed; /* the connection has been authenticated fine */
- sshstate state; /* always use ssh.c:state() to change state! */
+ sshstate state; /* always use curl_ssh.c:state() to change */
sshstate nextstate; /* the state to goto after stopping */
CURLcode actualcode; /* the actual error code */
struct curl_slist *quote_item; /* for the quote option */
diff --git a/lib/curl_ssluse.h b/lib/curl_ssluse.h
index 42e999eec..669be57c1 100644
--- a/lib/curl_ssluse.h
+++ b/lib/curl_ssluse.h
@@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -26,7 +26,8 @@
#ifdef USE_SSLEAY
/*
- * This header should only be needed to get included by sslgen.c and ssluse.c
+ * This header should only be needed to get included by curl_sslgen.c and
+ * curl_ssluse.c
*/
#include "curl_urldata.h"
diff --git a/lib/curl_url.h b/lib/curl_url.h
index a026e90e8..cc113abdc 100644
--- a/lib/curl_url.h
+++ b/lib/curl_url.h
@@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -24,7 +24,7 @@
#include "curl_setup.h"
/*
- * Prototypes for library-wide functions provided by url.c
+ * Prototypes for library-wide functions provided by curl_url.c
*/
CURLcode Curl_open(struct SessionHandle **curl);
diff --git a/lib/curl_urldata.h b/lib/curl_urldata.h
index d5d1859c9..d9edee079 100644
--- a/lib/curl_urldata.h
+++ b/lib/curl_urldata.h
@@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -664,7 +664,7 @@ struct SingleRequest {
bool forbidchunk; /* used only to explicitly forbid chunk-upload for
specific upload buffers. See readmoredata() in
- http.c for details. */
+ curl_http.c for details. */
};
/*
@@ -731,8 +731,8 @@ struct Curl_handler {
*/
CURLcode (*disconnect)(struct connectdata *, bool dead_connection);
- /* If used, this function gets called from transfer.c:readwrite_data() to
- allow the protocol to do extra reads/writes */
+ /* If used, this function gets called from curl_transfer.c:readwrite_data()
+ to allow the protocol to do extra reads/writes */
CURLcode (*readwrite)(struct SessionHandle *data, struct connectdata *conn,
ssize_t *nread, bool *readmore);
@@ -1276,7 +1276,7 @@ struct UrlState {
struct FTP *ftp;
/* void *tftp; not used */
struct FILEPROTO *file;
- void *telnet; /* private for telnet.c-eyes only */
+ void *telnet; /* private for curl_telnet.c-eyes only */
void *generic;
struct SSHPROTO *ssh;
struct FTP *imap;
@@ -1317,8 +1317,8 @@ struct DynamicStatic {
* the 'DynamicStatic' struct.
* Character pointer fields point to dynamic storage, unless otherwise stated.
*/
-struct Curl_one_easy; /* declared and used only in multi.c */
-struct Curl_multi; /* declared and used only in multi.c */
+struct Curl_one_easy; /* declared and used only in curl_multi.c */
+struct Curl_multi; /* declared and used only in curl_multi.c */
enum dupstring {
STRING_CERT, /* client certificate file name */
diff --git a/lib/cyassl.c b/lib/cyassl.c
index a2f941ed1..32f1cfe5c 100644
--- a/lib/cyassl.c
+++ b/lib/cyassl.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -22,7 +22,7 @@
/*
* Source file for all CyaSSL-specific code for the TLS/SSL layer. No code
- * but sslgen.c should ever call or use these functions.
+ * but curl_sslgen.c should ever call or use these functions.
*
*/
diff --git a/lib/easy.c b/lib/easy.c
index b4f0390a9..a2181cc4d 100644
--- a/lib/easy.c
+++ b/lib/easy.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -62,7 +62,7 @@
#include "curl_slist.h"
#include "curl_amigaos.h"
#include "curl_rand.h"
-#include "curl_non-ascii.h"
+#include "curl_non_ascii.h"
#include "curl_warnless.h"
#include "curl_conncache.h"
diff --git a/lib/escape.c b/lib/escape.c
index 1d542618e..c0ed571bd 100644
--- a/lib/escape.c
+++ b/lib/escape.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -30,7 +30,7 @@
#include "curl_memory.h"
#include "curl_urldata.h"
#include "curl_warnless.h"
-#include "curl_non-ascii.h"
+#include "curl_non_ascii.h"
#include "curl_escape.h"
#define _MPRINTF_REPLACE /* use our functions only */
diff --git a/lib/formdata.c b/lib/formdata.c
index 6b7166379..c7d85c4b4 100644
--- a/lib/formdata.c
+++ b/lib/formdata.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -857,8 +857,8 @@ static CURLcode AddFormDataf(struct FormData **formp,
}
/*
- * Curl_formclean() is used from http.c, this cleans a built FormData linked
- * list
+ * Curl_formclean() is used from curl_http.c, this cleans a built FormData
+ * linked list
*/
void Curl_formclean(struct FormData **form_ptr)
{
diff --git a/lib/ftp.c b/lib/ftp.c
index d9f933ffd..653e30b66 100644
--- a/lib/ftp.c
+++ b/lib/ftp.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -80,7 +80,7 @@
#include "curl_speedcheck.h"
#include "curl_warnless.h"
#include "curl_http_proxy.h"
-#include "curl_non-ascii.h"
+#include "curl_non_ascii.h"
#define _MPRINTF_REPLACE /* use our functions only */
#include <curl/mprintf.h>
@@ -3109,7 +3109,7 @@ static CURLcode ftp_statemach_act(struct connectdata *conn)
}
-/* called repeatedly until done from multi.c */
+/* called repeatedly until done from curl_multi.c */
static CURLcode ftp_multi_statemach(struct connectdata *conn,
bool *done)
{
@@ -4461,7 +4461,7 @@ static CURLcode ftp_dophase_done(struct connectdata *conn,
return CURLE_OK;
}
-/* called from multi.c while DOing */
+/* called from curl_multi.c while DOing */
static CURLcode ftp_doing(struct connectdata *conn,
bool *dophase_done)
{
diff --git a/lib/gtls.c b/lib/gtls.c
index 4e2254109..5c9d165e7 100644
--- a/lib/gtls.c
+++ b/lib/gtls.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -22,7 +22,7 @@
/*
* Source file for all GnuTLS-specific code for the TLS/SSL layer. No code
- * but sslgen.c should ever call or use these functions.
+ * but curl_sslgen.c should ever call or use these functions.
*
* Note: don't use the GnuTLS' *_t variable type names in this source code,
* since they were not present in 1.0.X.
diff --git a/lib/hostip.c b/lib/hostip.c
index 5ba76d314..7cc51f899 100644
--- a/lib/hostip.c
+++ b/lib/hostip.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -71,10 +71,10 @@
#endif
/*
- * hostip.c explained
- * ==================
+ * curl_hostip.c explained
+ * =======================
*
- * The main COMPILE-TIME DEFINES to keep in mind when reading the host*.c
+ * The main COMPILE-TIME DEFINES to keep in mind when reading the curl_host*.c
* source file are these:
*
* CURLRES_IPV6 - this host has getaddrinfo() and family, and thus we use
@@ -93,17 +93,17 @@
* libcurl is not built to use an asynchronous resolver, CURLRES_SYNCH is
* defined.
*
- * The host*.c sources files are split up like this:
+ * The curl_host*.c sources files are split up like this:
*
- * hostip.c - method-independent resolver functions and utility functions
- * hostasyn.c - functions for asynchronous name resolves
- * hostsyn.c - functions for synchronous name resolves
- * hostip4.c - ipv4-specific functions
- * hostip6.c - ipv6-specific functions
+ * curl_hostip.c - method-independent resolver and utility functions
+ * curl_hostasyn.c - functions for asynchronous name resolves
+ * curl_hostsyn.c - functions for synchronous name resolves
+ * curl_hostip4.c - ipv4-specific functions
+ * curl_hostip6.c - ipv6-specific functions
*
* The two asynchronous name resolver backends are implemented in:
- * asyn-ares.c - functions for ares-using name resolves
- * asyn-thread.c - functions for threaded name resolves
+ * curl_asyn_ares.c - functions for ares-using name resolves
+ * curl_asyn_thread.c - functions for threaded name resolves
* The curl_hostip.h is the united header file for all this. It defines the
* CURLRES_* defines based on the config*.h and curl_setup.h defines.
diff --git a/lib/hostip6.c b/lib/hostip6.c
index 0081df7f5..cfd6081c1 100644
--- a/lib/hostip6.c
+++ b/lib/hostip6.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -65,8 +65,8 @@
#if defined(CURLDEBUG) && defined(HAVE_GETNAMEINFO)
/* These are strictly for memory tracing and are using the same style as the
- * family otherwise present in memdebug.c. I put these ones here since they
- * require a bunch of structs I didn't want to include in memdebug.c
+ * family otherwise present in curl_memdebug.c. I put these ones here since
+ * they require a bunch of structs I didn't want to include there.
*/
/*
diff --git a/lib/http.c b/lib/http.c
index 4f4469c5e..420361c76 100644
--- a/lib/http.c
+++ b/lib/http.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -72,7 +72,7 @@
#include "curl_content_encoding.h"
#include "curl_http_proxy.h"
#include "curl_warnless.h"
-#include "curl_non-ascii.h"
+#include "curl_non_ascii.h"
#define _MPRINTF_REPLACE /* use our functions only */
#include <curl/mprintf.h>
@@ -679,8 +679,8 @@ Curl_http_output_auth(struct connectdata *conn,
/*
* Curl_http_input_auth() deals with Proxy-Authenticate: and WWW-Authenticate:
- * headers. They are dealt with both in the transfer.c main loop and in the
- * proxy CONNECT loop.
+ * headers. They are dealt with both in the curl_transfer.c main loop and in
+ * the proxy CONNECT loop.
*/
CURLcode Curl_http_input_auth(struct connectdata *conn,
@@ -936,7 +936,7 @@ static int http_should_fail(struct connectdata *conn)
* readmoredata() is a "fread() emulation" to provide POST and/or request
* data. It is used when a huge POST is to be made and the entire chunk wasn't
* sent in the first send(). This function will then be called from the
- * transfer.c loop when more data is to be sent to the peer.
+ * curl_transfer.c loop when more data is to be sent to the peer.
*
* Returns the amount of bytes it filled the buffer with.
*/
@@ -1536,7 +1536,7 @@ CURLcode Curl_add_custom_headers(struct connectdata *conn,
checkprefix("Host:", headers->data))
;
else if(conn->data->set.httpreq == HTTPREQ_POST_FORM &&
- /* this header (extended by formdata.c) is sent later */
+ /* this header (extended by curl_formdata.c) is sent later */
checkprefix("Content-Type:", headers->data))
;
else if(conn->bits.authneg &&
@@ -1728,10 +1728,10 @@ CURLcode Curl_http(struct connectdata *conn, bool *done)
}
}
- /* The User-Agent string might have been allocated in url.c already, because
- it might have been used in the proxy connect, but if we have got a header
- with the user-agent string specified, we erase the previously made string
- here. */
+ /* The User-Agent string might have been allocated in curl_url.c already,
+ because it might have been used in the proxy connect, but if we have
+ got a header with the user-agent string specified, we erase the
+ previously made string here. */
if(Curl_checkheaders(data, "User-Agent:") && conn->allocptr.uagent) {
free(conn->allocptr.uagent);
conn->allocptr.uagent=NULL;
diff --git a/lib/http_chunks.c b/lib/http_chunks.c
index 050501b11..2112f72ec 100644
--- a/lib/http_chunks.c
+++ b/lib/http_chunks.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -30,7 +30,7 @@
#include "curl_content_encoding.h"
#include "curl_http.h"
#include "curl_memory.h"
-#include "curl_non-ascii.h" /* for Curl_convert_to_network prototype */
+#include "curl_non_ascii.h" /* for Curl_convert_to_network prototype */
#define _MPRINTF_REPLACE /* use our functions only */
#include <curl/mprintf.h>
@@ -315,7 +315,7 @@ CHUNKcode Curl_httpchunk_read(struct connectdata *conn,
}
}
else {
- /* conn->trailer is assumed to be freed in url.c on a
+ /* conn->trailer is assumed to be freed in curl_url.c on a
connection basis */
if(conn->trlPos >= conn->trlMax) {
/* we always allocate three extra bytes, just because when the full
diff --git a/lib/http_digest.c b/lib/http_digest.c
index d835eb27b..dae679903 100644
--- a/lib/http_digest.c
+++ b/lib/http_digest.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -33,7 +33,7 @@
#include "curl_strtok.h"
#include "curl_url.h"
#include "curl_memory.h"
-#include "curl_non-ascii.h" /* included for Curl_convert_... prototypes */
+#include "curl_non_ascii.h" /* included for Curl_convert_... prototypes */
#include "curl_warnless.h"
#define _MPRINTF_REPLACE /* use our functions only */
diff --git a/lib/http_proxy.c b/lib/http_proxy.c
index 6bbc92615..14ef9dc1e 100644
--- a/lib/http_proxy.c
+++ b/lib/http_proxy.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -33,7 +33,7 @@
#include "curl_select.h"
#include "curl_rawstr.h"
#include "curl_progress.h"
-#include "curl_non-ascii.h"
+#include "curl_non_ascii.h"
#include "curl_connect.h"
#define _MPRINTF_REPLACE /* use our functions only */
diff --git a/lib/imap.c b/lib/imap.c
index 4a552bc59..8175daa1a 100644
--- a/lib/imap.c
+++ b/lib/imap.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -718,7 +718,7 @@ static CURLcode imap_statemach_act(struct connectdata *conn)
return result;
}
-/* Called repeatedly until done from multi.c */
+/* Called repeatedly until done from curl_multi.c */
static CURLcode imap_multi_statemach(struct connectdata *conn,
bool *done)
{
@@ -1045,7 +1045,7 @@ static CURLcode imap_dophase_done(struct connectdata *conn, bool connected)
return CURLE_OK;
}
-/* Called from multi.c while DOing */
+/* Called from curl_multi.c while DOing */
static CURLcode imap_doing(struct connectdata *conn, bool *dophase_done)
{
CURLcode result = imap_multi_statemach(conn, dophase_done);
diff --git a/lib/krb5.c b/lib/krb5.c
index f5389c857..d793fef02 100644
--- a/lib/krb5.c
+++ b/lib/krb5.c
@@ -1,8 +1,8 @@
-/* GSSAPI/krb5 support for FTP - loosely based on old krb4.c
+/* GSSAPI/krb5 support for FTP - loosely based on old curl_krb4.c
*
* Copyright (c) 1995, 1996, 1997, 1998, 1999 Kungliga Tekniska Högskolan
* (Royal Institute of Technology, Stockholm, Sweden).
- * Copyright (c) 2004 - 2012 Daniel Stenberg
+ * Copyright (c) 2004 - 2013 Daniel Stenberg
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/lib/ldap.c b/lib/ldap.c
index 76c2984ee..59f3b832e 100644
--- a/lib/ldap.c
+++ b/lib/ldap.c
@@ -1,11 +1,11 @@
/***************************************************************************
- * _ _ ____ _
- * Project ___| | | | _ \| |
- * / __| | | | |_) | |
- * | (__| |_| | _ <| |___
- * \___|\___/|_| \_\_____|
+ * _ _ ____ _
+ * Project ___| | | | _ \| |
+ * / __| | | | |_) | |
+ * | (__| |_| | _ <| |___
+ * \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -27,8 +27,8 @@
/*
* Notice that USE_OPENLDAP is only a source code selection switch. When
* libcurl is built with USE_OPENLDAP defined the libcurl source code that
- * gets compiled is the code from openldap.c, otherwise the code that gets
- * compiled is the code from ldap.c.
+ * gets compiled is the code from curl_openldap.c, otherwise the code that
+ * gets compiled is the code from curl_ldap.c.
*
* When USE_OPENLDAP is defined a recent version of the OpenLDAP library
* might be required for compilation and runtime. In order to use ancient
diff --git a/lib/mprintf.c b/lib/mprintf.c
index cbd604d36..35b9f644f 100644
--- a/lib/mprintf.c
+++ b/lib/mprintf.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1999 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1999 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -73,7 +73,7 @@
#endif
/*
- * Max integer data types that mprintf.c is capable
+ * Max integer data types that curl_mprintf.c is capable
*/
#ifdef HAVE_LONG_LONG_TYPE
diff --git a/lib/multi.c b/lib/multi.c
index c4f21628d..9553883cb 100644
--- a/lib/multi.c
+++ b/lib/multi.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -598,7 +598,7 @@ CURLMcode curl_multi_add_handle(CURLM *multi_handle,
*
* Curl_hash_print(multi->sockhash, debug_print_sock_hash);
*
- * Enable the hash print function first by editing hash.c
+ * Enable the hash print function first by editing curl_hash.c
*/
static void debug_print_sock_hash(void *p)
{
diff --git a/lib/non-ascii.c b/lib/non-ascii.c
index b966b5bbf..68b33a92a 100644
--- a/lib/non-ascii.c
+++ b/lib/non-ascii.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -26,7 +26,7 @@
#include <curl/curl.h>
-#include "curl_non-ascii.h"
+#include "curl_non_ascii.h"
#include "curl_formdata.h"
#include "curl_sendf.h"
#include "curl_urldata.h"
@@ -314,8 +314,8 @@ void Curl_convert_close(struct SessionHandle *data)
}
/*
- * Curl_convert_form() is used from http.c, this converts any form items that
- need to be sent in the network encoding. Returns CURLE_OK on success.
+ * Curl_convert_form() is used from curl_http.c, this converts any form items
+ * that need to be sent in the network encoding. Returns CURLE_OK on success.
*/
CURLcode Curl_convert_form(struct SessionHandle *data, struct FormData *form)
{
diff --git a/lib/nss.c b/lib/nss.c
index a6829dffe..15e92a722 100644
--- a/lib/nss.c
+++ b/lib/nss.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -22,7 +22,7 @@
/*
* Source file for all NSS-specific code for the TLS/SSL layer. No code
- * but sslgen.c should ever call or use these functions.
+ * but curl_sslgen.c should ever call or use these functions.
*/
#include "curl_setup.h"
diff --git a/lib/openldap.c b/lib/openldap.c
index 08c06f10d..b10d31e18 100644
--- a/lib/openldap.c
+++ b/lib/openldap.c
@@ -1,12 +1,12 @@
/***************************************************************************
- * _ _ ____ _
- * Project ___| | | | _ \| |
- * / __| | | | |_) | |
- * | (__| |_| | _ <| |___
- * \___|\___/|_| \_\_____|
+ * _ _ ____ _
+ * Project ___| | | | _ \| |
+ * / __| | | | |_) | |
+ * | (__| |_| | _ <| |___
+ * \___|\___/|_| \_\_____|
*
* Copyright (C) 2010, Howard Chu, <hyc@openldap.org>
- * Copyright (C) 2011 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 2011 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -28,8 +28,8 @@
/*
* Notice that USE_OPENLDAP is only a source code selection switch. When
* libcurl is built with USE_OPENLDAP defined the libcurl source code that
- * gets compiled is the code from openldap.c, otherwise the code that gets
- * compiled is the code from ldap.c.
+ * gets compiled is the code from curl_openldap.c, otherwise the code that
+ * gets compiled is the code from curl_ldap.c.
*
* When USE_OPENLDAP is defined a recent version of the OpenLDAP library
* might be required for compilation and runtime. In order to use ancient
diff --git a/lib/pingpong.c b/lib/pingpong.c
index 468174457..d28e78aa2 100644
--- a/lib/pingpong.c
+++ b/lib/pingpong.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -32,7 +32,7 @@
#include "curl_speedcheck.h"
#include "curl_pingpong.h"
#include "curl_multiif.h"
-#include "curl_non-ascii.h"
+#include "curl_non_ascii.h"
#define _MPRINTF_REPLACE /* use our functions only */
#include <curl/mprintf.h>
diff --git a/lib/polarssl.c b/lib/polarssl.c
index 35794224b..81c70264f 100644
--- a/lib/polarssl.c
+++ b/lib/polarssl.c
@@ -6,7 +6,7 @@
* \___|\___/|_| \_\_____|
*
* Copyright (C) 2010, 2011, Hoi-Ho Chan, <hoiho.chan@gmail.com>
- * Copyright (C) 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 2012 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -23,7 +23,7 @@
/*
* Source file for all PolarSSL-specific code for the TLS/SSL layer. No code
- * but sslgen.c should ever call or use these functions.
+ * but curl_sslgen.c should ever call or use these functions.
*
*/
diff --git a/lib/pop3.c b/lib/pop3.c
index 9d6c68ba7..0d157f00b 100644
--- a/lib/pop3.c
+++ b/lib/pop3.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -1207,7 +1207,7 @@ static CURLcode pop3_statemach_act(struct connectdata *conn)
return result;
}
-/* Called repeatedly until done from multi.c */
+/* Called repeatedly until done from curl_multi.c */
static CURLcode pop3_multi_statemach(struct connectdata *conn, bool *done)
{
struct pop3_conn *pop3c = &conn->proto.pop3c;
@@ -1547,7 +1547,7 @@ static CURLcode pop3_dophase_done(struct connectdata *conn, bool connected)
return CURLE_OK;
}
-/* Called from multi.c while DOing */
+/* Called from curl_multi.c while DOing */
static CURLcode pop3_doing(struct connectdata *conn, bool *dophase_done)
{
CURLcode result = pop3_multi_statemach(conn, dophase_done);
diff --git a/lib/rtsp.c b/lib/rtsp.c
index 917c6f20e..71e434c47 100644
--- a/lib/rtsp.c
+++ b/lib/rtsp.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -381,10 +381,10 @@ static CURLcode rtsp_do(struct connectdata *conn, bool *done)
}
}
- /* The User-Agent string might have been allocated in url.c already, because
- it might have been used in the proxy connect, but if we have got a header
- with the user-agent string specified, we erase the previously made string
- here. */
+ /* The User-Agent string might have been allocated in curl_url.c already,
+ because it might have been used in the proxy connect, but if we have
+ got a header with the user-agent string specified, we erase the
+ previously made string here. */
if(Curl_checkheaders(data, "User-Agent:") && conn->allocptr.uagent) {
Curl_safefree(conn->allocptr.uagent);
conn->allocptr.uagent = NULL;
diff --git a/lib/sendf.c b/lib/sendf.c
index 35f0d0ea9..a1ec50977 100644
--- a/lib/sendf.c
+++ b/lib/sendf.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -30,7 +30,7 @@
#include "curl_sslgen.h"
#include "curl_ssh.h"
#include "curl_multiif.h"
-#include "curl_non-ascii.h"
+#include "curl_non_ascii.h"
#define _MPRINTF_REPLACE /* use the internal *printf() functions */
#include <curl/mprintf.h>
diff --git a/lib/smtp.c b/lib/smtp.c
index 7295e3efa..5c4c25c6f 100644
--- a/lib/smtp.c
+++ b/lib/smtp.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -1226,7 +1226,7 @@ static CURLcode smtp_statemach_act(struct connectdata *conn)
return result;
}
-/* Called repeatedly until done from multi.c */
+/* Called repeatedly until done from curl_multi.c */
static CURLcode smtp_multi_statemach(struct connectdata *conn, bool *done)
{
struct smtp_conn *smtpc = &conn->proto.smtpc;
@@ -1584,7 +1584,7 @@ static CURLcode smtp_dophase_done(struct connectdata *conn, bool connected)
return CURLE_OK;
}
-/* Called from multi.c while DOing */
+/* Called from curl_multi.c while DOing */
static CURLcode smtp_doing(struct connectdata *conn, bool *dophase_done)
{
CURLcode result = smtp_multi_statemach(conn, dophase_done);
diff --git a/lib/ssh.c b/lib/ssh.c
index 2eac88f2e..d769a041b 100644
--- a/lib/ssh.c
+++ b/lib/ssh.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -2620,7 +2620,7 @@ static void ssh_block2waitfor(struct connectdata *conn, bool block)
#define ssh_block2waitfor(x,y) Curl_nop_stmt
#endif
-/* called repeatedly until done from multi.c */
+/* called repeatedly until done from curl_multi.c */
static CURLcode ssh_multi_statemach(struct connectdata *conn, bool *done)
{
struct ssh_conn *sshc = &conn->proto.sshc;
@@ -2844,7 +2844,7 @@ CURLcode scp_perform(struct connectdata *conn,
return result;
}
-/* called from multi.c while DOing */
+/* called from curl_multi.c while DOing */
static CURLcode scp_doing(struct connectdata *conn,
bool *dophase_done)
{
@@ -3053,7 +3053,7 @@ CURLcode sftp_perform(struct connectdata *conn,
return result;
}
-/* called from multi.c while DOing */
+/* called from curl_multi.c while DOing */
static CURLcode sftp_doing(struct connectdata *conn,
bool *dophase_done)
{
@@ -3154,7 +3154,7 @@ static ssize_t sftp_recv(struct connectdata *conn, int sockindex,
return nread;
}
-/* The get_pathname() function is being borrowed from OpenSSH sftp.c
+/* The get_pathname() function is being borrowed from OpenSSH-sftp.c
version 4.6p1. */
/*
* Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
diff --git a/lib/ssluse.c b/lib/ssluse.c
index c5e56099b..0809d4614 100644
--- a/lib/ssluse.c
+++ b/lib/ssluse.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -22,7 +22,7 @@
/*
* Source file for all OpenSSL-specific code for the TLS/SSL layer. No code
- * but sslgen.c should ever call or use these functions.
+ * but curl_sslgen.c should ever call or use these functions.
*/
/*
@@ -69,7 +69,7 @@
#include "curl_warnless.h"
#include "curl_memory.h"
-#include "curl_non-ascii.h" /* for Curl_convert_from_utf8 prototype */
+#include "curl_non_ascii.h" /* for Curl_convert_from_utf8 prototype */
/* The last #include file should be: */
#include "curl_memdebug.h"
diff --git a/lib/tftp.c b/lib/tftp.c
index 39d9f58e5..1af246ec0 100644
--- a/lib/tftp.c
+++ b/lib/tftp.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -1371,7 +1371,7 @@ static CURLcode tftp_multi_statemach(struct connectdata *conn, bool *done)
*
* tftp_doing
*
- * Called from multi.c while DOing
+ * Called from curl_multi.c while DOing
*
**********************************************************/
static CURLcode tftp_doing(struct connectdata *conn, bool *dophase_done)
diff --git a/lib/transfer.c b/lib/transfer.c
index c37f6c6b2..a1dee1dd0 100644
--- a/lib/transfer.c
+++ b/lib/transfer.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -79,7 +79,7 @@
#include "curl_select.h"
#include "curl_multiif.h"
#include "curl_connect.h"
-#include "curl_non-ascii.h"
+#include "curl_non_ascii.h"
#define _MPRINTF_REPLACE /* use our functions only */
#include <curl/mprintf.h>
@@ -683,7 +683,7 @@ static CURLcode readwrite_data(struct SessionHandle *data,
if(k->badheader < HEADER_ALLBAD) {
/* This switch handles various content encodings. If there's an
error here, be sure to check over the almost identical code
- in http_chunks.c.
+ in curl_http_chunks.c.
Make sure that ALL_CONTENT_ENCODINGS contains all the
encodings handled here. */
#ifdef HAVE_LIBZ
diff --git a/lib/url.c b/lib/url.c
index 8c2ab27cb..52badc5d7 100644
--- a/lib/url.c
+++ b/lib/url.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -98,7 +98,7 @@ int curl_win32_idn_to_ascii(const char *in, char **out);
#include "curl_speedcheck.h"
#include "curl_rawstr.h"
#include "curl_warnless.h"
-#include "curl_non-ascii.h"
+#include "curl_non_ascii.h"
#include "curl_inet_pton.h"
/* And now for the protocols */
@@ -2190,7 +2190,7 @@ CURLcode Curl_setopt(struct SessionHandle *data, CURLoption option,
break;
case CURLOPT_SSH_KEYFUNCTION:
- /* setting to NULL is fine since the ssh.c functions themselves will
+ /* setting to NULL is fine since the curl_ssh.c functions themselves will
then rever to use the internal default */
data->set.ssh_keyfunc = va_arg(param, curl_sshkeycallback);
break;
@@ -3688,7 +3688,7 @@ static CURLcode parseurlandfillconn(struct SessionHandle *data,
*/
/* Note: if you add a new protocol, please update the list in
- * lib/version.c too! */
+ * lib/curl_version.c too! */
if(checkprefix("FTP.", conn->host.name))
protop = "ftp";
@@ -5356,7 +5356,7 @@ CURLcode Curl_do(struct connectdata **connp, bool *done)
/* generic protocol-specific function pointer set in curl_connect() */
result = conn->handler->do_it(conn, done);
- /* This was formerly done in transfer.c, but we better do it here */
+ /* This was formerly done in curl_transfer.c, but we better do it here */
if((CURLE_SEND_ERROR == result) && conn->bits.reuse) {
/*
* If the connection is using an easy handle, call reconnect