diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/CMakeLists.txt | 44 | ||||
| -rw-r--r-- | lib/Makefile.am | 53 | ||||
| -rw-r--r-- | lib/Makefile.inc | 246 | ||||
| -rw-r--r-- | lib/Makefile.netware | 4 | ||||
| -rw-r--r-- | lib/Makefile.vc6 | 162 | ||||
| -rw-r--r-- | lib/README.curlx | 2 | ||||
| -rw-r--r-- | lib/README.hostip | 24 | ||||
| -rw-r--r-- | lib/amigaos.c (renamed from lib/curl_amigaos.c) | 4 | ||||
| -rw-r--r-- | lib/amigaos.h (renamed from lib/curl_amigaos.h) | 2 | ||||
| -rw-r--r-- | lib/arpa_telnet.h (renamed from lib/curl_arpa_telnet.h) | 0 | ||||
| -rw-r--r-- | lib/asyn-ares.c (renamed from lib/curl_asyn_ares.c) | 30 | ||||
| -rw-r--r-- | lib/asyn-thread.c (renamed from lib/curl_asyn_thread.c) | 24 | ||||
| -rw-r--r-- | lib/asyn.h (renamed from lib/curl_asyn.h) | 8 | ||||
| -rw-r--r-- | lib/axtls.c (renamed from lib/curl_axtls.c) | 58 | ||||
| -rw-r--r-- | lib/axtls.h (renamed from lib/curl_axtls.h) | 2 | ||||
| -rw-r--r-- | lib/base64.c (renamed from lib/curl_base64.c) | 14 | ||||
| -rw-r--r-- | lib/bundles.c (renamed from lib/curl_bundles.c) | 18 | ||||
| -rw-r--r-- | lib/bundles.h (renamed from lib/curl_bundles.h) | 0 | ||||
| -rw-r--r-- | lib/conncache.c (renamed from lib/curl_conncache.c) | 20 | ||||
| -rw-r--r-- | lib/conncache.h (renamed from lib/curl_conncache.h) | 0 | ||||
| -rw-r--r-- | lib/connect.c (renamed from lib/curl_connect.c) | 32 | ||||
| -rw-r--r-- | lib/connect.h (renamed from lib/curl_connect.h) | 6 | ||||
| -rw-r--r-- | lib/content_encoding.c (renamed from lib/curl_content_encoding.c) | 10 | ||||
| -rw-r--r-- | lib/content_encoding.h (renamed from lib/curl_content_encoding.h) | 2 | ||||
| -rw-r--r-- | lib/cookie.c (renamed from lib/curl_cookie.c) | 20 | ||||
| -rw-r--r-- | lib/cookie.h (renamed from lib/curl_cookie.h) | 2 | ||||
| -rw-r--r-- | lib/curl_addrinfo.c | 18 | ||||
| -rw-r--r-- | lib/curl_addrinfo.h | 2 | ||||
| -rw-r--r-- | lib/curl_darwinssl.c | 21 | ||||
| -rw-r--r-- | lib/curl_darwinssl.h | 2 | ||||
| -rw-r--r-- | lib/curl_fnmatch.c | 4 | ||||
| -rw-r--r-- | lib/curl_gethostname.c | 2 | ||||
| -rw-r--r-- | lib/curl_gssapi.c | 4 | ||||
| -rw-r--r-- | lib/curl_gssapi.h | 4 | ||||
| -rw-r--r-- | lib/curl_md4.h | 2 | ||||
| -rw-r--r-- | lib/curl_memrchr.c | 4 | ||||
| -rw-r--r-- | lib/curl_memrchr.h | 2 | ||||
| -rw-r--r-- | lib/curl_multibyte.c | 4 | ||||
| -rw-r--r-- | lib/curl_multibyte.h | 2 | ||||
| -rw-r--r-- | lib/curl_ntlm.c | 14 | ||||
| -rw-r--r-- | lib/curl_ntlm.h | 2 | ||||
| -rw-r--r-- | lib/curl_ntlm_core.c | 12 | ||||
| -rw-r--r-- | lib/curl_ntlm_core.h | 2 | ||||
| -rw-r--r-- | lib/curl_ntlm_msgs.c | 16 | ||||
| -rw-r--r-- | lib/curl_ntlm_msgs.h | 2 | ||||
| -rw-r--r-- | lib/curl_ntlm_wb.c | 14 | ||||
| -rw-r--r-- | lib/curl_ntlm_wb.h | 2 | ||||
| -rw-r--r-- | lib/curl_rand.c | 4 | ||||
| -rw-r--r-- | lib/curl_rtmp.c | 14 | ||||
| -rw-r--r-- | lib/curl_sasl.c | 8 | ||||
| -rw-r--r-- | lib/curl_sasl.h | 2 | ||||
| -rw-r--r-- | lib/curl_schannel.c | 32 | ||||
| -rw-r--r-- | lib/curl_schannel.h | 4 | ||||
| -rw-r--r-- | lib/curl_sspi.c | 4 | ||||
| -rw-r--r-- | lib/curl_sspi.h | 2 | ||||
| -rw-r--r-- | lib/curl_threads.c | 4 | ||||
| -rw-r--r-- | lib/curl_threads.h | 2 | ||||
| -rw-r--r-- | lib/curlx.h | 22 | ||||
| -rw-r--r-- | lib/cyassl.c (renamed from lib/curl_cyassl.c) | 26 | ||||
| -rw-r--r-- | lib/cyassl.h (renamed from lib/curl_cyassl.h) | 2 | ||||
| -rw-r--r-- | lib/dict.c (renamed from lib/curl_dict.c) | 18 | ||||
| -rw-r--r-- | lib/dict.h (renamed from lib/curl_dict.h) | 0 | ||||
| -rw-r--r-- | lib/easy.c (renamed from lib/curl_easy.c) | 44 | ||||
| -rw-r--r-- | lib/easyif.h (renamed from lib/curl_easyif.h) | 4 | ||||
| -rw-r--r-- | lib/escape.c (renamed from lib/curl_escape.c) | 14 | ||||
| -rw-r--r-- | lib/escape.h (renamed from lib/curl_escape.h) | 0 | ||||
| -rw-r--r-- | lib/file.c (renamed from lib/curl_file.c) | 28 | ||||
| -rw-r--r-- | lib/file.h (renamed from lib/curl_file.h) | 0 | ||||
| -rw-r--r-- | lib/fileinfo.c (renamed from lib/curl_fileinfo.c) | 8 | ||||
| -rw-r--r-- | lib/fileinfo.h (renamed from lib/curl_fileinfo.h) | 0 | ||||
| -rw-r--r-- | lib/formdata.c (renamed from lib/curl_formdata.c) | 18 | ||||
| -rw-r--r-- | lib/formdata.h (renamed from lib/curl_formdata.h) | 0 | ||||
| -rw-r--r-- | lib/ftp.c (renamed from lib/curl_ftp.c) | 70 | ||||
| -rw-r--r-- | lib/ftp.h (renamed from lib/curl_ftp.h) | 8 | ||||
| -rw-r--r-- | lib/ftplistparser.c (renamed from lib/curl_ftplistparser.c) | 18 | ||||
| -rw-r--r-- | lib/ftplistparser.h (renamed from lib/curl_ftplistparser.h) | 2 | ||||
| -rw-r--r-- | lib/getenv.c (renamed from lib/curl_getenv.c) | 4 | ||||
| -rw-r--r-- | lib/getinfo.c (renamed from lib/curl_getinfo.c) | 14 | ||||
| -rw-r--r-- | lib/getinfo.h (renamed from lib/curl_getinfo.h) | 0 | ||||
| -rw-r--r-- | lib/gopher.c (renamed from lib/curl_gopher.c) | 24 | ||||
| -rw-r--r-- | lib/gopher.h (renamed from lib/curl_gopher.h) | 0 | ||||
| -rw-r--r-- | lib/gtls.c (renamed from lib/curl_gtls.c) | 28 | ||||
| -rw-r--r-- | lib/gtls.h (renamed from lib/curl_gtls.h) | 4 | ||||
| -rw-r--r-- | lib/hash.c (renamed from lib/curl_hash.c) | 8 | ||||
| -rw-r--r-- | lib/hash.h (renamed from lib/curl_hash.h) | 4 | ||||
| -rw-r--r-- | lib/hmac.c (renamed from lib/curl_hmac.c) | 4 | ||||
| -rw-r--r-- | lib/hostasyn.c (renamed from lib/curl_hostasyn.c) | 18 | ||||
| -rw-r--r-- | lib/hostcheck.c (renamed from lib/curl_hostcheck.c) | 6 | ||||
| -rw-r--r-- | lib/hostcheck.h (renamed from lib/curl_hostcheck.h) | 0 | ||||
| -rw-r--r-- | lib/hostip.c (renamed from lib/curl_hostip.c) | 50 | ||||
| -rw-r--r-- | lib/hostip.h (renamed from lib/curl_hostip.h) | 10 | ||||
| -rw-r--r-- | lib/hostip4.c (renamed from lib/curl_hostip4.c) | 20 | ||||
| -rw-r--r-- | lib/hostip6.c (renamed from lib/curl_hostip6.c) | 28 | ||||
| -rw-r--r-- | lib/hostsyn.c (renamed from lib/curl_hostsyn.c) | 18 | ||||
| -rw-r--r-- | lib/http.c (renamed from lib/curl_http.c) | 68 | ||||
| -rw-r--r-- | lib/http.h (renamed from lib/curl_http.h) | 6 | ||||
| -rw-r--r-- | lib/http_chunks.c (renamed from lib/curl_http_chunks.c) | 18 | ||||
| -rw-r--r-- | lib/http_chunks.h (renamed from lib/curl_http_chunks.h) | 0 | ||||
| -rw-r--r-- | lib/http_digest.c (renamed from lib/curl_http_digest.c) | 22 | ||||
| -rw-r--r-- | lib/http_digest.h (renamed from lib/curl_http_digest.h) | 2 | ||||
| -rw-r--r-- | lib/http_negotiate.c (renamed from lib/curl_http_negotiate.c) | 14 | ||||
| -rw-r--r-- | lib/http_negotiate.h (renamed from lib/curl_http_negotiate.h) | 0 | ||||
| -rw-r--r-- | lib/http_negotiate_sspi.c (renamed from lib/curl_http_negotiate_sspi.c) | 14 | ||||
| -rw-r--r-- | lib/http_proxy.c (renamed from lib/curl_http_proxy.c) | 26 | ||||
| -rw-r--r-- | lib/http_proxy.h (renamed from lib/curl_http_proxy.h) | 0 | ||||
| -rw-r--r-- | lib/idn_win32.c (renamed from lib/curl_idn_win32.c) | 4 | ||||
| -rw-r--r-- | lib/if2ip.c (renamed from lib/curl_if2ip.c) | 10 | ||||
| -rw-r--r-- | lib/if2ip.h (renamed from lib/curl_if2ip.h) | 2 | ||||
| -rw-r--r-- | lib/imap.c (renamed from lib/curl_imap.c) | 50 | ||||
| -rw-r--r-- | lib/imap.h (renamed from lib/curl_imap.h) | 6 | ||||
| -rw-r--r-- | lib/inet_ntop.c (renamed from lib/curl_inet_ntop.c) | 4 | ||||
| -rw-r--r-- | lib/inet_ntop.h (renamed from lib/curl_inet_ntop.h) | 2 | ||||
| -rw-r--r-- | lib/inet_pton.c (renamed from lib/curl_inet_pton.c) | 4 | ||||
| -rw-r--r-- | lib/inet_pton.h (renamed from lib/curl_inet_pton.h) | 2 | ||||
| -rw-r--r-- | lib/krb4.c (renamed from lib/curl_krb4.c) | 14 | ||||
| -rw-r--r-- | lib/krb4.h (renamed from lib/curl_krb4.h) | 0 | ||||
| -rw-r--r-- | lib/krb5.c (renamed from lib/curl_krb5.c) | 18 | ||||
| -rw-r--r-- | lib/ldap.c (renamed from lib/curl_ldap.c) | 36 | ||||
| -rw-r--r-- | lib/llist.c (renamed from lib/curl_llist.c) | 6 | ||||
| -rw-r--r-- | lib/llist.h (renamed from lib/curl_llist.h) | 2 | ||||
| -rw-r--r-- | lib/md4.c (renamed from lib/curl_md4.c) | 4 | ||||
| -rw-r--r-- | lib/md5.c (renamed from lib/curl_md5.c) | 10 | ||||
| -rw-r--r-- | lib/memdebug.c (renamed from lib/curl_memdebug.c) | 6 | ||||
| -rw-r--r-- | lib/memdebug.h (renamed from lib/curl_memdebug.h) | 2 | ||||
| -rw-r--r-- | lib/mprintf.c (renamed from lib/curl_mprintf.c) | 8 | ||||
| -rw-r--r-- | lib/multi.c (renamed from lib/curl_multi.c) | 38 | ||||
| -rw-r--r-- | lib/multiif.h (renamed from lib/curl_multiif.h) | 4 | ||||
| -rw-r--r-- | lib/netrc.c (renamed from lib/curl_netrc.c) | 12 | ||||
| -rw-r--r-- | lib/netrc.h (renamed from lib/curl_netrc.h) | 0 | ||||
| -rw-r--r-- | lib/non-ascii.c (renamed from lib/curl_non_ascii.c) | 18 | ||||
| -rw-r--r-- | lib/non-ascii.h (renamed from lib/curl_non_ascii.h) | 4 | ||||
| -rw-r--r-- | lib/nonblock.c (renamed from lib/curl_nonblock.c) | 4 | ||||
| -rw-r--r-- | lib/nonblock.h (renamed from lib/curl_nonblock.h) | 0 | ||||
| -rw-r--r-- | lib/nss.c (renamed from lib/curl_nss.c) | 32 | ||||
| -rw-r--r-- | lib/nssg.h (renamed from lib/curl_nssg.h) | 9 | ||||
| -rw-r--r-- | lib/nwlib.c (renamed from lib/curl_nwlib.c) | 4 | ||||
| -rw-r--r-- | lib/nwos.c (renamed from lib/curl_nwos.c) | 2 | ||||
| -rw-r--r-- | lib/openldap.c (renamed from lib/curl_openldap.c) | 28 | ||||
| -rw-r--r-- | lib/parsedate.c (renamed from lib/curl_parsedate.c) | 8 | ||||
| -rw-r--r-- | lib/parsedate.h (renamed from lib/curl_parsedate.h) | 0 | ||||
| -rw-r--r-- | lib/pingpong.c (renamed from lib/curl_pingpong.c) | 22 | ||||
| -rw-r--r-- | lib/pingpong.h (renamed from lib/curl_pingpong.h) | 4 | ||||
| -rw-r--r-- | lib/polarssl.c (renamed from lib/curl_polarssl.c) | 26 | ||||
| -rw-r--r-- | lib/polarssl.h (renamed from lib/curl_polarssl.h) | 2 | ||||
| -rw-r--r-- | lib/pop3.c (renamed from lib/curl_pop3.c) | 52 | ||||
| -rw-r--r-- | lib/pop3.h (renamed from lib/curl_pop3.h) | 4 | ||||
| -rw-r--r-- | lib/progress.c (renamed from lib/curl_progress.c) | 8 | ||||
| -rw-r--r-- | lib/progress.h (renamed from lib/curl_progress.h) | 2 | ||||
| -rw-r--r-- | lib/qssl.c (renamed from lib/curl_qssl.c) | 16 | ||||
| -rw-r--r-- | lib/qssl.h (renamed from lib/curl_qssl.h) | 9 | ||||
| -rw-r--r-- | lib/rawstr.c (renamed from lib/curl_rawstr.c) | 4 | ||||
| -rw-r--r-- | lib/rawstr.h (renamed from lib/curl_rawstr.h) | 0 | ||||
| -rw-r--r-- | lib/rtsp.c (renamed from lib/curl_rtsp.c) | 36 | ||||
| -rw-r--r-- | lib/rtsp.h (renamed from lib/curl_rtsp.h) | 0 | ||||
| -rw-r--r-- | lib/security.c (renamed from lib/curl_security.c) | 16 | ||||
| -rw-r--r-- | lib/select.c (renamed from lib/curl_select.c) | 10 | ||||
| -rw-r--r-- | lib/select.h (renamed from lib/curl_select.h) | 2 | ||||
| -rw-r--r-- | lib/sendf.c (renamed from lib/curl_sendf.c) | 26 | ||||
| -rw-r--r-- | lib/sendf.h (renamed from lib/curl_sendf.h) | 2 | ||||
| -rw-r--r-- | lib/setup.h (renamed from lib/curl_setup.h) | 4 | ||||
| -rw-r--r-- | lib/setup_once.h (renamed from lib/curl_setup_once.h) | 0 | ||||
| -rw-r--r-- | lib/share.c (renamed from lib/curl_share.c) | 10 | ||||
| -rw-r--r-- | lib/share.h (renamed from lib/curl_share.h) | 6 | ||||
| -rw-r--r-- | lib/slist.c (renamed from lib/curl_slist.c) | 6 | ||||
| -rw-r--r-- | lib/slist.h (renamed from lib/curl_slist.h) | 0 | ||||
| -rw-r--r-- | lib/smtp.c (renamed from lib/curl_smtp.c) | 52 | ||||
| -rw-r--r-- | lib/smtp.h (renamed from lib/curl_smtp.h) | 6 | ||||
| -rw-r--r-- | lib/sockaddr.h (renamed from lib/curl_sockaddr.h) | 2 | ||||
| -rw-r--r-- | lib/socks.c (renamed from lib/curl_socks.c) | 18 | ||||
| -rw-r--r-- | lib/socks.h (renamed from lib/curl_socks.h) | 2 | ||||
| -rw-r--r-- | lib/socks_gssapi.c (renamed from lib/curl_socks_gssapi.c) | 16 | ||||
| -rw-r--r-- | lib/socks_sspi.c (renamed from lib/curl_socks_sspi.c) | 18 | ||||
| -rw-r--r-- | lib/speedcheck.c (renamed from lib/curl_speedcheck.c) | 10 | ||||
| -rw-r--r-- | lib/speedcheck.h (renamed from lib/curl_speedcheck.h) | 4 | ||||
| -rw-r--r-- | lib/splay.c (renamed from lib/curl_splay.c) | 4 | ||||
| -rw-r--r-- | lib/splay.h (renamed from lib/curl_splay.h) | 2 | ||||
| -rw-r--r-- | lib/ssh.c (renamed from lib/curl_ssh.c) | 60 | ||||
| -rw-r--r-- | lib/ssh.h (renamed from lib/curl_ssh.h) | 6 | ||||
| -rw-r--r-- | lib/sslgen.c (renamed from lib/curl_sslgen.c) | 32 | ||||
| -rw-r--r-- | lib/sslgen.h (renamed from lib/curl_sslgen.h) | 2 | ||||
| -rw-r--r-- | lib/ssluse.c (renamed from lib/curl_ssluse.c) | 36 | ||||
| -rw-r--r-- | lib/ssluse.h (renamed from lib/curl_ssluse.h) | 9 | ||||
| -rw-r--r-- | lib/strdup.c (renamed from lib/curl_strdup.c) | 4 | ||||
| -rw-r--r-- | lib/strdup.h (renamed from lib/curl_strdup.h) | 2 | ||||
| -rw-r--r-- | lib/strequal.c (renamed from lib/curl_strequal.c) | 4 | ||||
| -rw-r--r-- | lib/strequal.h (renamed from lib/curl_strequal.h) | 0 | ||||
| -rw-r--r-- | lib/strerror.c (renamed from lib/curl_strerror.c) | 6 | ||||
| -rw-r--r-- | lib/strerror.h (renamed from lib/curl_strerror.h) | 2 | ||||
| -rw-r--r-- | lib/strtok.c (renamed from lib/curl_strtok.c) | 4 | ||||
| -rw-r--r-- | lib/strtok.h (renamed from lib/curl_strtok.h) | 2 | ||||
| -rw-r--r-- | lib/strtoofft.c (renamed from lib/curl_strtoofft.c) | 4 | ||||
| -rw-r--r-- | lib/strtoofft.h (renamed from lib/curl_strtoofft.h) | 2 | ||||
| -rw-r--r-- | lib/telnet.c (renamed from lib/curl_telnet.c) | 26 | ||||
| -rw-r--r-- | lib/telnet.h (renamed from lib/curl_telnet.h) | 0 | ||||
| -rw-r--r-- | lib/tftp.c (renamed from lib/curl_tftp.c) | 32 | ||||
| -rw-r--r-- | lib/tftp.h (renamed from lib/curl_tftp.h) | 0 | ||||
| -rw-r--r-- | lib/timeval.c (renamed from lib/curl_timeval.c) | 2 | ||||
| -rw-r--r-- | lib/timeval.h (renamed from lib/curl_timeval.h) | 2 | ||||
| -rw-r--r-- | lib/transfer.c (renamed from lib/curl_transfer.c) | 56 | ||||
| -rw-r--r-- | lib/transfer.h (renamed from lib/curl_transfer.h) | 0 | ||||
| -rw-r--r-- | lib/url.c (renamed from lib/curl_url.c) | 98 | ||||
| -rw-r--r-- | lib/url.h (renamed from lib/curl_url.h) | 6 | ||||
| -rw-r--r-- | lib/urldata.h (renamed from lib/curl_urldata.h) | 52 | ||||
| -rw-r--r-- | lib/version.c (renamed from lib/curl_version.c) | 6 | ||||
| -rw-r--r-- | lib/warnless.c (renamed from lib/curl_warnless.c) | 4 | ||||
| -rw-r--r-- | lib/warnless.h (renamed from lib/curl_warnless.h) | 0 | ||||
| -rw-r--r-- | lib/wildcard.c (renamed from lib/curl_wildcard.c) | 10 | ||||
| -rw-r--r-- | lib/wildcard.h (renamed from lib/curl_wildcard.h) | 0 |
208 files changed, 1357 insertions, 1556 deletions
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 517ffcfed..09b976c4c 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -18,18 +18,18 @@ if(MSVC) endif() # SET(CSOURCES -# # curl_memdebug.c -not used -# # curl_nwlib.c - Not used -# # curl_strtok.c - specify later -# # curl_strtoofft.c - specify later +# # memdebug.c -not used +# # nwlib.c - Not used +# # strtok.c - specify later +# # 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} -# curl_krb4.c -# curl_security.c +# krb4.c +# security.c # ) # ENDIF(CURL_KRB4) @@ -37,33 +37,33 @@ endif() # MARK_AS_ADVANCED(CURL_MALLOC_DEBUG) # IF(CURL_MALLOC_DEBUG) # SET(CSOURCES ${CSOURCES} -# curl_memdebug.c +# 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} -# curl_strtoofft.c +# strtoofft.c # ) # ENDIF(NOT HAVE_STRTOLL AND NOT HAVE__STRTOI64) if(HAVE_FEATURES_H) set_source_files_properties( - 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 + 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 COMPILE_FLAGS -D_BSD_SOURCE) endif(HAVE_FEATURES_H) diff --git a/lib/Makefile.am b/lib/Makefile.am index 6b8fcdece..bb7721d0e 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al. +# Copyright (C) 1998 - 2012, 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,47 +30,16 @@ DOCS = README.encoding README.memoryleak README.ares README.curlx \ CMAKE_DIST = CMakeLists.txt curl_config.h.cmake -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-test08.sh \ - objnames-test10.sh \ - objnames.inc \ - setup-os400.h \ - vc6libcurl.dsw +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-test08.sh \ + objnames-test10.sh objnames.inc CLEANFILES = $(DSP) $(VCPROJ) diff --git a/lib/Makefile.inc b/lib/Makefile.inc index 27658639e..f97ef6d0e 100644 --- a/lib/Makefile.inc +++ b/lib/Makefile.inc @@ -7,214 +7,40 @@ # CSRC2 = file4.c file5.c file6.c # CSOURCES = $(CSRC1) $(CSRC2) -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 \ - curl_amigaos.h \ - curl_arpa_telnet.h \ - curl_asyn.h \ - curl_axtls.h \ - curl_base64.h \ - curl_bundles.h \ - curl_conncache.h \ - curl_connect.h \ - curl_content_encoding.h \ - curl_cookie.h \ - curl_cyassl.h \ - curl_darwinssl.h \ - curl_dict.h \ - curl_easyif.h \ - curl_escape.h \ - curl_file.h \ - curl_fileinfo.h \ - curl_fnmatch.h \ - curl_formdata.h \ - curl_ftp.h \ - curl_ftplistparser.h \ - curl_gethostname.h \ - curl_getinfo.h \ - curl_gopher.h \ - curl_gssapi.h \ - curl_gtls.h \ - curl_hash.h \ - curl_hmac.h \ - curl_hostcheck.h \ - curl_hostip.h \ - curl_http.h \ - curl_http_chunks.h \ - curl_http_digest.h \ - curl_http_negotiate.h \ - curl_http_proxy.h \ - curl_if2ip.h \ - curl_imap.h \ - curl_inet_ntop.h \ - curl_inet_pton.h \ - curl_krb4.h \ - curl_ldap.h \ - curl_llist.h \ - curl_md4.h \ - curl_md5.h \ - curl_memdebug.h \ - curl_memory.h \ - curl_memrchr.h \ - curl_multibyte.h \ - curl_multiif.h \ - curl_netrc.h \ - curl_non_ascii.h \ - curl_nonblock.h \ - curl_nssg.h \ - curl_ntlm.h \ - curl_ntlm_core.h \ - curl_ntlm_msgs.h \ - curl_ntlm_wb.h \ - curl_parsedate.h \ - curl_pingpong.h \ - curl_polarssl.h \ - curl_pop3.h \ - curl_progress.h \ - curl_qssl.h \ - curl_rand.h \ - curl_rawstr.h \ - curl_rtmp.h \ - curl_rtsp.h \ - curl_sasl.h \ - curl_schannel.h \ - curl_select.h \ - curl_sendf.h \ - curl_setup.h \ - curl_setup_once.h \ - curl_share.h \ - curl_slist.h \ - curl_smtp.h \ - curl_sockaddr.h \ - curl_socks.h \ - curl_speedcheck.h \ - curl_splay.h \ - curl_ssh.h \ - curl_sslgen.h \ - curl_ssluse.h \ - curl_sspi.h \ - curl_strdup.h \ - curl_strequal.h \ - curl_strerror.h \ - curl_strtok.h \ - curl_strtoofft.h \ - curl_telnet.h \ - curl_tftp.h \ - curl_threads.h \ - curl_timeval.h \ - curl_transfer.h \ - curl_url.h \ - curl_urldata.h \ - curl_wildcard.h \ - curlx.h +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 +HHEADERS = arpa_telnet.h netrc.h file.h timeval.h qssl.h hostip.h \ + progress.h formdata.h cookie.h http.h sendf.h ftp.h url.h dict.h \ + if2ip.h speedcheck.h urldata.h curl_ldap.h ssluse.h escape.h telnet.h \ + getinfo.h strequal.h krb4.h memdebug.h http_chunks.h curl_rand.h \ + curl_fnmatch.h wildcard.h fileinfo.h ftplistparser.h strtok.h \ + connect.h llist.h hash.h content_encoding.h share.h curl_md4.h \ + curl_md5.h http_digest.h http_negotiate.h inet_pton.h amigaos.h \ + strtoofft.h strerror.h inet_ntop.h curlx.h curl_memory.h setup.h \ + transfer.h select.h easyif.h multiif.h parsedate.h sslgen.h gtls.h \ + tftp.h sockaddr.h splay.h strdup.h setup_once.h socks.h ssh.h nssg.h \ + curl_base64.h rawstr.h curl_addrinfo.h curl_sspi.h slist.h nonblock.h \ + curl_memrchr.h imap.h pop3.h smtp.h pingpong.h rtsp.h curl_threads.h \ + warnless.h curl_hmac.h polarssl.h curl_rtmp.h curl_gethostname.h \ + gopher.h axtls.h cyassl.h http_proxy.h non-ascii.h asyn.h curl_ntlm.h \ + curl_gssapi.h curl_ntlm_wb.h curl_ntlm_core.h curl_ntlm_msgs.h \ + curl_sasl.h curl_schannel.h curl_multibyte.h curl_darwinssl.h \ + hostcheck.h bundles.h conncache.h diff --git a/lib/Makefile.netware b/lib/Makefile.netware index 70e6647ed..79c13ce24 100644 --- a/lib/Makefile.netware +++ b/lib/Makefile.netware @@ -315,9 +315,9 @@ endif # Makefile.inc provides the CSOURCES and HHEADERS defines include Makefile.inc -OBJS := $(patsubst %.c,$(OBJDIR)/%.o,$(strip $(CSOURCES))) $(OBJDIR)/curl_nwos.o +OBJS := $(patsubst %.c,$(OBJDIR)/%.o,$(strip $(CSOURCES))) $(OBJDIR)/nwos.o -OBJL = $(OBJS) $(OBJDIR)/curl_nwlib.o $(LDLIBS) +OBJL = $(OBJS) $(OBJDIR)/nwlib.o $(LDLIBS) all: lib nlm diff --git a/lib/Makefile.vc6 b/lib/Makefile.vc6 index 99a158f32..a8e7741b9 100644 --- a/lib/Makefile.vc6 +++ b/lib/Makefile.vc6 @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___
# \___|\___/|_| \_\_____|
#
-# Copyright (C) 1999 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
+# Copyright (C) 1999 - 2012, 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)\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)\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_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)\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 \
+ $(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 \
$(RESOURCE)
all : $(TARGET)
diff --git a/lib/README.curlx b/lib/README.curlx index 6d6e29ec9..5375b0d1d 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 curl_strtoofft.c. Note that the function is only provided if no + code in 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 890187187..9723b93fd 100644 --- a/lib/README.hostip +++ b/lib/README.hostip @@ -1,7 +1,7 @@ - curl_hostip.c explained + hostip.c explained ================== - The main COMPILE-TIME DEFINES to keep in mind when reading the curl_host*.c + The main COMPILE-TIME DEFINES to keep in mind when reading the 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 curl_host*.c sources files are split up like this: + The host*.c sources files are split up like this: - 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 + 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 - 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. + The hostip.h is the single united header file for all this. It defines the + CURLRES_* defines based on the config*.h and setup.h defines. diff --git a/lib/curl_amigaos.c b/lib/amigaos.c index c726abb68..71ea704e1 100644 --- a/lib/curl_amigaos.c +++ b/lib/amigaos.c @@ -20,13 +20,13 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #if defined(__AMIGA__) && !defined(__ixemul__) #include <amitcp/socketbasetags.h> -#include "curl_amigaos.h" +#include "amigaos.h" struct Library *SocketBase = NULL; extern int errno, h_errno; diff --git a/lib/curl_amigaos.h b/lib/amigaos.h index 76578be86..7476a13d8 100644 --- a/lib/curl_amigaos.h +++ b/lib/amigaos.h @@ -21,7 +21,7 @@ * KIND, either express or implied. * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #if defined(__AMIGA__) && !defined(__ixemul__) diff --git a/lib/curl_arpa_telnet.h b/lib/arpa_telnet.h index 098d9a92f..098d9a92f 100644 --- a/lib/curl_arpa_telnet.h +++ b/lib/arpa_telnet.h diff --git a/lib/curl_asyn_ares.c b/lib/asyn-ares.c index 6e09e9b98..44d00bdb0 100644 --- a/lib/curl_asyn_ares.c +++ b/lib/asyn-ares.c @@ -20,7 +20,7 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #ifdef HAVE_LIMITS_H #include <limits.h> @@ -51,23 +51,23 @@ /*********************************************************************** * Only for ares-enabled builds * And only for functions that fulfill the asynch resolver backend API - * as defined in curl_asyn.h, nothing else belongs in this file! + * as defined in asyn.h, nothing else belongs in this file! **********************************************************************/ #ifdef CURLRES_ARES -#include "curl_urldata.h" -#include "curl_sendf.h" -#include "curl_hostip.h" -#include "curl_hash.h" -#include "curl_share.h" -#include "curl_strerror.h" -#include "curl_url.h" -#include "curl_multiif.h" -#include "curl_inet_pton.h" -#include "curl_connect.h" -#include "curl_select.h" -#include "curl_progress.h" +#include "urldata.h" +#include "sendf.h" +#include "hostip.h" +#include "hash.h" +#include "share.h" +#include "strerror.h" +#include "url.h" +#include "multiif.h" +#include "inet_pton.h" +#include "connect.h" +#include "select.h" +#include "progress.h" #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> @@ -87,7 +87,7 @@ #include "curl_memory.h" /* The last #include file should be: */ -#include "curl_memdebug.h" +#include "memdebug.h" struct ResolverResults { int num_pending; /* number of ares_gethostbyname() requests */ diff --git a/lib/curl_asyn_thread.c b/lib/asyn-thread.c index 6d3667fab..0d29d5887 100644 --- a/lib/curl_asyn_thread.c +++ b/lib/asyn-thread.c @@ -20,7 +20,7 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #ifdef HAVE_NETINET_IN_H #include <netinet/in.h> @@ -57,16 +57,16 @@ # define RESOLVER_ENOMEM ENOMEM #endif -#include "curl_urldata.h" -#include "curl_sendf.h" -#include "curl_hostip.h" -#include "curl_hash.h" -#include "curl_share.h" -#include "curl_strerror.h" -#include "curl_url.h" -#include "curl_multiif.h" -#include "curl_inet_pton.h" -#include "curl_inet_ntop.h" +#include "urldata.h" +#include "sendf.h" +#include "hostip.h" +#include "hash.h" +#include "share.h" +#include "strerror.h" +#include "url.h" +#include "multiif.h" +#include "inet_pton.h" +#include "inet_ntop.h" #include "curl_threads.h" #define _MPRINTF_REPLACE /* use our functions only */ @@ -74,7 +74,7 @@ #include "curl_memory.h" /* The last #include file should be: */ -#include "curl_memdebug.h" +#include "memdebug.h" /*********************************************************************** * Only for threaded name resolves builds diff --git a/lib/curl_asyn.h b/lib/asyn.h index 1167a3159..e7c1b886d 100644 --- a/lib/curl_asyn.h +++ b/lib/asyn.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2011, 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 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #include "curl_addrinfo.h" struct addrinfo; @@ -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. - * curl_asyn_ares.c and curl_asyn_thread.c are the current implementations of - * asynch resolver backends. + * asyn-ares.c and asyn-thread.c are the current implementations of asynch + * resolver backends. */ /* diff --git a/lib/curl_axtls.c b/lib/axtls.c index 8bd606a40..19ed73091 100644 --- a/lib/curl_axtls.c +++ b/lib/axtls.c @@ -5,8 +5,8 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 2010, DirecTV * contact: Eric Hu <ehu@directv.com> - * Copyright (C) 2010 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 2010, DirecTV + * contact: Eric Hu <ehu@directv.com> * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -23,27 +23,27 @@ /* * Source file for all axTLS-specific code for the TLS/SSL layer. No code - * but curl_sslgen.c should ever call or use these functions. + * but sslgen.c should ever call or use these functions. */ -#include "curl_setup.h" +#include "setup.h" #ifdef USE_AXTLS #include <axTLS/ssl.h> -#include "curl_axtls.h" - -#include "curl_sendf.h" -#include "curl_inet_pton.h" -#include "curl_sslgen.h" -#include "curl_parsedate.h" -#include "curl_connect.h" /* for the connect timeout */ -#include "curl_select.h" +#include "axtls.h" + +#include "sendf.h" +#include "inet_pton.h" +#include "sslgen.h" +#include "parsedate.h" +#include "connect.h" /* for the connect timeout */ +#include "select.h" #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> #include "curl_memory.h" /* The last #include file should be: */ -#include "curl_memdebug.h" -#include "curl_hostcheck.h" +#include "memdebug.h" +#include "hostcheck.h" /* SSL_read is opied from axTLS compat layer */ @@ -65,14 +65,14 @@ static int SSL_read(SSL *ssl, void *buf, int num) int Curl_axtls_init(void) { /* axTLS has no global init. Everything is done through SSL and SSL_CTX - * structs stored in connectdata structure. Perhaps can move to curl_axtls.h. + * structs stored in connectdata structure. Perhaps can move to axtls.h. */ return 1; } int Curl_axtls_cleanup(void) { - /* axTLS has no global cleanup. Perhaps can move this to curl_axtls.h. */ + /* axTLS has no global cleanup. Perhaps can move this to axtls.h. */ return 1; } @@ -199,7 +199,7 @@ Curl_axtls_connect(struct connectdata *conn, infof(data, "found certificates in %s\n", data->set.ssl.CAfile); } - /* curl_gtls.c tasks we're skipping for now: + /* 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, } } - /* curl_gtls.c does more here that is being left out for now + /* 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, curl_gtls.c gets the peer certificates and fails out depending on + /* Here, 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, curl_gtls.c does issuer verification. axTLS has no straightforward + /* Here, gtls.c does issuer verification. axTLS has no straightforward * equivalent, so omitting for now.*/ - /* Here, curl_gtls.c does the following + /* Here, 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 curl_ssluse.c: (void)SSL_shutdown(connssl->ssl); + /* line from ssluse.c: (void)SSL_shutdown(connssl->ssl); axTLS compat layer does nothing for SSL_shutdown */ - /* The following line is from curl_ssluse.c. There seems to be no axTLS + /* The following line is from ssluse.c. There seems to be no axTLS equivalent. ssl_free and ssl_ctx_free close things. SSL_set_connect_state(connssl->handle); */ @@ -430,9 +430,8 @@ void Curl_axtls_close(struct connectdata *conn, int sockindex) */ int Curl_axtls_shutdown(struct connectdata *conn, int sockindex) { - /* 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. + /* 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. */ int retval = 0; struct ssl_connect_data *connssl = &conn->ssl[sockindex]; @@ -522,8 +521,7 @@ static ssize_t axtls_recv(struct connectdata *conn, /* connection data */ */ int Curl_axtls_check_cxn(struct connectdata *conn) { - /* curl_ssluse.c line: - rc = SSL_peek(conn->ssl[FIRSTSOCKET].ssl, (void*)&buf, 1); + /* 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? */ @@ -535,8 +533,8 @@ void Curl_axtls_session_free(void *ptr) { (void)ptr; /* free the ID */ - /* both curl_ssluse.c and curl_gtls.c do something here, but axTLS's - OpenSSL compatibility layer does nothing, so we do nothing too. */ + /* both ssluse.c and 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/curl_axtls.h b/lib/axtls.h index 06f78ed32..8d33b1c7a 100644 --- a/lib/curl_axtls.h +++ b/lib/axtls.h @@ -25,7 +25,7 @@ #ifdef USE_AXTLS #include "curl/curl.h" -#include "curl_urldata.h" +#include "urldata.h" int Curl_axtls_init(void); int Curl_axtls_cleanup(void); diff --git a/lib/curl_base64.c b/lib/base64.c index 45c7a95bc..ec46c09ab 100644 --- a/lib/curl_base64.c +++ b/lib/base64.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2012, 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,19 +22,19 @@ /* Base64 encoding/decoding */ -#include "curl_setup.h" +#include "setup.h" #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> -#include "curl_urldata.h" /* for the SessionHandle definition */ -#include "curl_warnless.h" +#include "urldata.h" /* for the SessionHandle definition */ +#include "warnless.h" #include "curl_base64.h" #include "curl_memory.h" -#include "curl_non_ascii.h" +#include "non-ascii.h" -/* include curl_memdebug.h last */ -#include "curl_memdebug.h" +/* include memdebug.h last */ +#include "memdebug.h" /* ---- Base64 Encoding/Decoding Table --- */ static const char table64[]= diff --git a/lib/curl_bundles.c b/lib/bundles.c index efbaeee4f..f09ee2a35 100644 --- a/lib/curl_bundles.c +++ b/lib/bundles.c @@ -21,21 +21,21 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #include <curl/curl.h> -#include "curl_urldata.h" -#include "curl_url.h" -#include "curl_progress.h" -#include "curl_multiif.h" -#include "curl_bundles.h" -#include "curl_sendf.h" -#include "curl_rawstr.h" +#include "urldata.h" +#include "url.h" +#include "progress.h" +#include "multiif.h" +#include "bundles.h" +#include "sendf.h" +#include "rawstr.h" #include "curl_memory.h" /* The last #include file should be: */ -#include "curl_memdebug.h" +#include "memdebug.h" static void conn_llist_dtor(void *user, void *element) { diff --git a/lib/curl_bundles.h b/lib/bundles.h index 3816c4065..3816c4065 100644 --- a/lib/curl_bundles.h +++ b/lib/bundles.h diff --git a/lib/curl_conncache.c b/lib/conncache.c index bc95e07df..a3a90f879 100644 --- a/lib/curl_conncache.c +++ b/lib/conncache.c @@ -21,22 +21,22 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #include <curl/curl.h> -#include "curl_urldata.h" -#include "curl_url.h" -#include "curl_progress.h" -#include "curl_multiif.h" -#include "curl_sendf.h" -#include "curl_rawstr.h" -#include "curl_bundles.h" -#include "curl_conncache.h" +#include "urldata.h" +#include "url.h" +#include "progress.h" +#include "multiif.h" +#include "sendf.h" +#include "rawstr.h" +#include "bundles.h" +#include "conncache.h" #include "curl_memory.h" /* The last #include file should be: */ -#include "curl_memdebug.h" +#include "memdebug.h" #define CONNECTION_HASH_SIZE 97 diff --git a/lib/curl_conncache.h b/lib/conncache.h index 03b129d4e..03b129d4e 100644 --- a/lib/curl_conncache.h +++ b/lib/conncache.h diff --git a/lib/curl_connect.c b/lib/connect.c index 85226d808..19f5b2f5b 100644 --- a/lib/curl_connect.c +++ b/lib/connect.c @@ -20,7 +20,7 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #ifdef HAVE_NETINET_IN_H #include <netinet/in.h> /* <netinet/tcp.h> may need it */ @@ -59,24 +59,24 @@ #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> -#include "curl_urldata.h" -#include "curl_sendf.h" -#include "curl_if2ip.h" -#include "curl_strerror.h" -#include "curl_connect.h" +#include "urldata.h" +#include "sendf.h" +#include "if2ip.h" +#include "strerror.h" +#include "connect.h" #include "curl_memory.h" -#include "curl_select.h" -#include "curl_url.h" -#include "curl_multiif.h" -#include "curl_sockaddr.h" /* required for Curl_sockaddr_storage */ -#include "curl_inet_ntop.h" -#include "curl_inet_pton.h" -#include "curl_sslgen.h" /* for Curl_ssl_check_cxn() */ -#include "curl_progress.h" -#include "curl_warnless.h" +#include "select.h" +#include "url.h" /* for Curl_safefree() */ +#include "multiif.h" +#include "sockaddr.h" /* required for Curl_sockaddr_storage */ +#include "inet_ntop.h" +#include "inet_pton.h" +#include "sslgen.h" /* for Curl_ssl_check_cxn() */ +#include "progress.h" +#include "warnless.h" /* The last #include file should be: */ -#include "curl_memdebug.h" +#include "memdebug.h" #ifdef __SYMBIAN32__ /* This isn't actually supported under Symbian OS */ diff --git a/lib/curl_connect.h b/lib/connect.h index db23b9281..f84361f2e 100644 --- a/lib/curl_connect.h +++ b/lib/connect.h @@ -21,10 +21,10 @@ * KIND, either express or implied. * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" -#include "curl_nonblock.h" -#include "curl_sockaddr.h" +#include "nonblock.h" /* for curlx_nonblock(), formerly Curl_nonblock() */ +#include "sockaddr.h" CURLcode Curl_is_connected(struct connectdata *conn, int sockindex, diff --git a/lib/curl_content_encoding.c b/lib/content_encoding.c index 6f4d1428a..3276ef988 100644 --- a/lib/curl_content_encoding.c +++ b/lib/content_encoding.c @@ -20,17 +20,17 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #ifdef HAVE_LIBZ -#include "curl_urldata.h" +#include "urldata.h" #include <curl/curl.h> -#include "curl_sendf.h" -#include "curl_content_encoding.h" +#include "sendf.h" +#include "content_encoding.h" #include "curl_memory.h" -#include "curl_memdebug.h" +#include "memdebug.h" /* Comment this out if zlib is always going to be at least ver. 1.2.0.4 (doing so will reduce code size slightly). */ diff --git a/lib/curl_content_encoding.h b/lib/content_encoding.h index 501f6c8ce..372da4a3b 100644 --- a/lib/curl_content_encoding.h +++ b/lib/content_encoding.h @@ -21,7 +21,7 @@ * KIND, either express or implied. * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" /* * Comma-separated list all supported Content-Encodings ('identity' is implied) diff --git a/lib/curl_cookie.c b/lib/cookie.c index 90ee884bb..644b33a25 100644 --- a/lib/curl_cookie.c +++ b/lib/cookie.c @@ -77,26 +77,26 @@ Example set of cookies: ****/ -#include "curl_setup.h" +#include "setup.h" #if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_COOKIES) #define _MPRINTF_REPLACE #include <curl/mprintf.h> -#include "curl_urldata.h" -#include "curl_cookie.h" -#include "curl_strequal.h" -#include "curl_strtok.h" -#include "curl_sendf.h" +#include "urldata.h" +#include "cookie.h" +#include "strequal.h" +#include "strtok.h" +#include "sendf.h" #include "curl_memory.h" -#include "curl_share.h" -#include "curl_strtoofft.h" -#include "curl_rawstr.h" +#include "share.h" +#include "strtoofft.h" +#include "rawstr.h" #include "curl_memrchr.h" /* The last #include file should be: */ -#include "curl_memdebug.h" +#include "memdebug.h" static void freecookie(struct Cookie *co) { diff --git a/lib/curl_cookie.h b/lib/cookie.h index d3b63f780..5997e4680 100644 --- a/lib/curl_cookie.h +++ b/lib/cookie.h @@ -21,7 +21,7 @@ * KIND, either express or implied. * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #include <curl/curl.h> diff --git a/lib/curl_addrinfo.c b/lib/curl_addrinfo.c index c2d5832e6..815b4ae64 100644 --- a/lib/curl_addrinfo.c +++ b/lib/curl_addrinfo.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2012, 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 @@ -20,7 +20,7 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #include <curl/curl.h> @@ -45,15 +45,15 @@ #endif #include "curl_addrinfo.h" -#include "curl_inet_pton.h" -#include "curl_warnless.h" +#include "inet_pton.h" +#include "warnless.h" #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> #include "curl_memory.h" /* The last #include file should be: */ -#include "curl_memdebug.h" +#include "memdebug.h" /* @@ -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 curl_memdebug.c. I put these ones here since - * they require a bunch of structs I didn't want to include there. + * 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 */ 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 curl_memdebug.c. I put these ones here since - * they require a bunch of structs I didn't want to include there. + * 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 */ int diff --git a/lib/curl_addrinfo.h b/lib/curl_addrinfo.h index 6d2b753eb..a5375cb33 100644 --- a/lib/curl_addrinfo.h +++ b/lib/curl_addrinfo.h @@ -22,7 +22,7 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #ifdef HAVE_NETINET_IN_H # include <netinet/in.h> diff --git a/lib/curl_darwinssl.c b/lib/curl_darwinssl.c index b919c1680..2d56b3920 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 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 2012, 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,11 +23,10 @@ /* * Source file for all iOS and Mac OS X SecureTransport-specific code for the - * TLS/SSL layer. No code but curl_sslgen.c should ever call or use these - * functions. + * TLS/SSL layer. No code but sslgen.c should ever call or use these functions. */ -#include "curl_setup.h" +#include "setup.h" #ifdef USE_DARWINSSL @@ -43,12 +42,12 @@ #include <sys/sysctl.h> #endif -#include "curl_urldata.h" -#include "curl_sendf.h" -#include "curl_inet_pton.h" -#include "curl_connect.h" -#include "curl_select.h" -#include "curl_sslgen.h" +#include "urldata.h" +#include "sendf.h" +#include "inet_pton.h" +#include "connect.h" +#include "select.h" +#include "sslgen.h" #include "curl_darwinssl.h" #define _MPRINTF_REPLACE /* use our functions only */ @@ -56,7 +55,7 @@ #include "curl_memory.h" /* The last #include file should be: */ -#include "curl_memdebug.h" +#include "memdebug.h" /* From MacTypes.h (which we can't include because it isn't present in iOS: */ #define ioErr -36 diff --git a/lib/curl_darwinssl.h b/lib/curl_darwinssl.h index 183d9371c..53053edca 100644 --- a/lib/curl_darwinssl.h +++ b/lib/curl_darwinssl.h @@ -21,7 +21,7 @@ * KIND, either express or implied. * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #ifdef USE_DARWINSSL diff --git a/lib/curl_fnmatch.c b/lib/curl_fnmatch.c index b6f7dd948..e18f52eab 100644 --- a/lib/curl_fnmatch.c +++ b/lib/curl_fnmatch.c @@ -20,7 +20,7 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #include "curl_fnmatch.h" @@ -29,7 +29,7 @@ #include "curl_memory.h" /* The last #include file should be: */ -#include "curl_memdebug.h" +#include "memdebug.h" #define CURLFNM_CHARSET_LEN (sizeof(char) * 256) #define CURLFNM_CHSET_SIZE (CURLFNM_CHARSET_LEN + 15) diff --git a/lib/curl_gethostname.c b/lib/curl_gethostname.c index ded1e6f94..ddee4ba1d 100644 --- a/lib/curl_gethostname.c +++ b/lib/curl_gethostname.c @@ -20,7 +20,7 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #include "curl_gethostname.h" diff --git a/lib/curl_gssapi.c b/lib/curl_gssapi.c index 2d2492ecb..b9c8ad0cf 100644 --- a/lib/curl_gssapi.c +++ b/lib/curl_gssapi.c @@ -20,12 +20,12 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #ifdef HAVE_GSSAPI #include "curl_gssapi.h" -#include "curl_sendf.h" +#include "sendf.h" OM_uint32 Curl_gss_init_sec_context( struct SessionHandle *data, diff --git a/lib/curl_gssapi.h b/lib/curl_gssapi.h index df4bcd650..fd4596b80 100644 --- a/lib/curl_gssapi.h +++ b/lib/curl_gssapi.h @@ -22,8 +22,8 @@ * ***************************************************************************/ -#include "curl_setup.h" -#include "curl_urldata.h" +#include "setup.h" +#include "urldata.h" #ifdef HAVE_GSSAPI diff --git a/lib/curl_md4.h b/lib/curl_md4.h index b0be9cf6c..6b6c16e13 100644 --- a/lib/curl_md4.h +++ b/lib/curl_md4.h @@ -22,7 +22,7 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" /* NSS crypto library does not provide the MD4 hash algorithm, so that we have * a local implementation of it */ diff --git a/lib/curl_memrchr.c b/lib/curl_memrchr.c index ad7f1880d..d79af9be7 100644 --- a/lib/curl_memrchr.c +++ b/lib/curl_memrchr.c @@ -20,7 +20,7 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #include "curl_memrchr.h" @@ -29,7 +29,7 @@ #include "curl_memory.h" /* The last #include file should be: */ -#include "curl_memdebug.h" +#include "memdebug.h" #ifndef HAVE_MEMRCHR diff --git a/lib/curl_memrchr.h b/lib/curl_memrchr.h index 324c73a7b..37061b608 100644 --- a/lib/curl_memrchr.h +++ b/lib/curl_memrchr.h @@ -22,7 +22,7 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #ifdef HAVE_MEMRCHR diff --git a/lib/curl_multibyte.c b/lib/curl_multibyte.c index 75d6544b0..7cb9e4c60 100644 --- a/lib/curl_multibyte.c +++ b/lib/curl_multibyte.c @@ -20,7 +20,7 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #if defined(USE_WIN32_IDN) || (defined(USE_WINDOWS_SSPI) && defined(UNICODE)) @@ -35,7 +35,7 @@ #include "curl_memory.h" /* The last #include file should be: */ -#include "curl_memdebug.h" +#include "memdebug.h" wchar_t *Curl_convert_UTF8_to_wchar(const char *str_utf8) { diff --git a/lib/curl_multibyte.h b/lib/curl_multibyte.h index 7ee5eae12..6ecccd3c9 100644 --- a/lib/curl_multibyte.h +++ b/lib/curl_multibyte.h @@ -21,7 +21,7 @@ * KIND, either express or implied. * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #if defined(USE_WIN32_IDN) || (defined(USE_WINDOWS_SSPI) && defined(UNICODE)) diff --git a/lib/curl_ntlm.c b/lib/curl_ntlm.c index 470b9c62a..9c7837254 100644 --- a/lib/curl_ntlm.c +++ b/lib/curl_ntlm.c @@ -20,7 +20,7 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #ifdef USE_NTLM @@ -33,26 +33,26 @@ #define DEBUG_ME 0 -#include "curl_urldata.h" -#include "curl_sendf.h" -#include "curl_rawstr.h" +#include "urldata.h" +#include "sendf.h" +#include "rawstr.h" #include "curl_ntlm.h" #include "curl_ntlm_msgs.h" #include "curl_ntlm_wb.h" -#include "curl_url.h" +#include "url.h" #include "curl_memory.h" #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> #if defined(USE_NSS) -#include "curl_nssg.h" +#include "nssg.h" #elif defined(USE_WINDOWS_SSPI) #include "curl_sspi.h" #endif /* The last #include file should be: */ -#include "curl_memdebug.h" +#include "memdebug.h" #if DEBUG_ME # define DEBUG_OUT(x) x diff --git a/lib/curl_ntlm.h b/lib/curl_ntlm.h index 21a9e9e47..b2783778b 100644 --- a/lib/curl_ntlm.h +++ b/lib/curl_ntlm.h @@ -22,7 +22,7 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #ifdef USE_NTLM diff --git a/lib/curl_ntlm_core.c b/lib/curl_ntlm_core.c index 9c1fdf98c..6b7d9fc46 100644 --- a/lib/curl_ntlm_core.c +++ b/lib/curl_ntlm_core.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2012, 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 @@ -20,7 +20,7 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #if defined(USE_NTLM) && !defined(USE_WINDOWS_SSPI) @@ -91,9 +91,9 @@ # error "Can't compile NTLM support without a crypto library." #endif -#include "curl_urldata.h" -#include "curl_non_ascii.h" -#include "curl_rawstr.h" +#include "urldata.h" +#include "non-ascii.h" +#include "rawstr.h" #include "curl_memory.h" #include "curl_ntlm_core.h" @@ -101,7 +101,7 @@ #include <curl/mprintf.h> /* The last #include file should be: */ -#include "curl_memdebug.h" +#include "memdebug.h" #ifdef USE_SSLEAY /* diff --git a/lib/curl_ntlm_core.h b/lib/curl_ntlm_core.h index 9aa126bb2..5615b3504 100644 --- a/lib/curl_ntlm_core.h +++ b/lib/curl_ntlm_core.h @@ -22,7 +22,7 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #if defined(USE_NTLM) && !defined(USE_WINDOWS_SSPI) diff --git a/lib/curl_ntlm_msgs.c b/lib/curl_ntlm_msgs.c index 18a7304a2..8e788d733 100644 --- a/lib/curl_ntlm_msgs.c +++ b/lib/curl_ntlm_msgs.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2012, 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 @@ -20,7 +20,7 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #ifdef USE_NTLM @@ -33,21 +33,21 @@ #define DEBUG_ME 0 -#include "curl_urldata.h" -#include "curl_non_ascii.h" -#include "curl_sendf.h" +#include "urldata.h" +#include "non-ascii.h" +#include "sendf.h" #include "curl_base64.h" #include "curl_ntlm_core.h" #include "curl_gethostname.h" #include "curl_multibyte.h" -#include "curl_warnless.h" +#include "warnless.h" #include "curl_memory.h" #ifdef USE_WINDOWS_SSPI # include "curl_sspi.h" #endif -#include "curl_sslgen.h" +#include "sslgen.h" #define BUILDING_CURL_NTLM_MSGS_C #include "curl_ntlm_msgs.h" @@ -56,7 +56,7 @@ #include <curl/mprintf.h> /* The last #include file should be: */ -#include "curl_memdebug.h" +#include "memdebug.h" /* "NTLMSSP" signature is always in ASCII regardless of the platform */ #define NTLMSSP_SIGNATURE "\x4e\x54\x4c\x4d\x53\x53\x50" diff --git a/lib/curl_ntlm_msgs.h b/lib/curl_ntlm_msgs.h index e7d185dea..703fb75e1 100644 --- a/lib/curl_ntlm_msgs.h +++ b/lib/curl_ntlm_msgs.h @@ -22,7 +22,7 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #ifdef USE_NTLM diff --git a/lib/curl_ntlm_wb.c b/lib/curl_ntlm_wb.c index 87ac6f48e..46a51c2c4 100644 --- a/lib/curl_ntlm_wb.c +++ b/lib/curl_ntlm_wb.c @@ -20,7 +20,7 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #if defined(USE_NTLM) && defined(NTLM_WB_ENABLED) @@ -40,19 +40,19 @@ #include <signal.h> #endif -#include "curl_urldata.h" -#include "curl_sendf.h" -#include "curl_select.h" +#include "urldata.h" +#include "sendf.h" +#include "select.h" #include "curl_ntlm_wb.h" -#include "curl_url.h" -#include "curl_strerror.h" +#include "url.h" +#include "strerror.h" #include "curl_memory.h" #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> /* The last #include file should be: */ -#include "curl_memdebug.h" +#include "memdebug.h" #if DEBUG_ME # define DEBUG_OUT(x) x diff --git a/lib/curl_ntlm_wb.h b/lib/curl_ntlm_wb.h index db6bc16b7..e3eaffe17 100644 --- a/lib/curl_ntlm_wb.h +++ b/lib/curl_ntlm_wb.h @@ -22,7 +22,7 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #if defined(USE_NTLM) && defined(NTLM_WB_ENABLED) diff --git a/lib/curl_rand.c b/lib/curl_rand.c index bfd5f1d53..047b7f345 100644 --- a/lib/curl_rand.c +++ b/lib/curl_rand.c @@ -20,7 +20,7 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #include <curl/curl.h> @@ -31,7 +31,7 @@ #include "curl_memory.h" /* The last #include file should be: */ -#include "curl_memdebug.h" +#include "memdebug.h" /* Private pseudo-random number seed. Unsigned integer >= 32bit. Threads mutual exclusion is not implemented to acess it since we do not require diff --git a/lib/curl_rtmp.c b/lib/curl_rtmp.c index b8caca0a0..b87bdf2c7 100644 --- a/lib/curl_rtmp.c +++ b/lib/curl_rtmp.c @@ -20,15 +20,15 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #ifdef USE_LIBRTMP -#include "curl_urldata.h" -#include "curl_nonblock.h" /* for curlx_nonblock */ -#include "curl_progress.h" /* for Curl_pgrsSetUploadSize */ -#include "curl_transfer.h" -#include "curl_warnless.h" +#include "urldata.h" +#include "nonblock.h" /* for curlx_nonblock */ +#include "progress.h" /* for Curl_pgrsSetUploadSize */ +#include "transfer.h" +#include "warnless.h" #include <curl/curl.h> #include <librtmp/rtmp.h> @@ -37,7 +37,7 @@ #include "curl_memory.h" /* The last #include file should be: */ -#include "curl_memdebug.h" +#include "memdebug.h" #ifdef _WIN32 #define setsockopt(a,b,c,d,e) (setsockopt)(a,b,c,(const char *)d,(int)e) diff --git a/lib/curl_sasl.c b/lib/curl_sasl.c index 1becc28df..ccb54a89f 100644 --- a/lib/curl_sasl.c +++ b/lib/curl_sasl.c @@ -24,10 +24,10 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #include <curl/curl.h> -#include "curl_urldata.h" +#include "urldata.h" #include "curl_base64.h" #include "curl_md5.h" @@ -35,14 +35,14 @@ #include "curl_hmac.h" #include "curl_ntlm_msgs.h" #include "curl_sasl.h" -#include "curl_warnless.h" +#include "warnless.h" #include "curl_memory.h" #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> /* The last #include file should be: */ -#include "curl_memdebug.h" +#include "memdebug.h" #ifndef CURL_DISABLE_CRYPTO_AUTH /* Retrieves the value for a corresponding key from the challenge string diff --git a/lib/curl_sasl.h b/lib/curl_sasl.h index fa8ac84ac..469c9a1e4 100644 --- a/lib/curl_sasl.h +++ b/lib/curl_sasl.h @@ -22,7 +22,7 @@ * ***************************************************************************/ -#include "curl_pingpong.h" +#include "pingpong.h" /* Authentication mechanism flags */ #define SASL_MECH_LOGIN 0x0001 diff --git a/lib/curl_schannel.c b/lib/curl_schannel.c index 06095d719..8cb3af80f 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 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 2012, 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,11 +24,21 @@ /* * Source file for all SChannel-specific code for the TLS/SSL layer. No code - * but curl_sslgen.c should ever call or use these functions. + * but sslgen.c should ever call or use these functions. * */ /* + * Based upon the PolarSSL implementation in polarssl.c and polarssl.h: + * Copyright (C) 2010, 2011, Hoi-Ho Chan, <hoiho.chan@gmail.com> + * + * Based upon the CyaSSL implementation in cyassl.c and cyassl.h: + * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al. + * + * Thanks for code and inspiration! + */ + +/* * TODO list for TLS/SSL implementation: * - implement client certificate authentication * - implement custom server certificate validation @@ -41,7 +51,7 @@ * http://msdn.microsoft.com/en-us/library/windows/desktop/aa380161.aspx */ -#include "curl_setup.h" +#include "setup.h" #ifdef USE_SCHANNEL @@ -51,21 +61,21 @@ #include "curl_sspi.h" #include "curl_schannel.h" -#include "curl_sslgen.h" -#include "curl_sendf.h" -#include "curl_connect.h" /* for the connect timeout */ -#include "curl_strerror.h" -#include "curl_select.h" /* for the socket readyness */ -#include "curl_inet_pton.h" /* for IP addr SNI check */ +#include "sslgen.h" +#include "sendf.h" +#include "connect.h" /* for the connect timeout */ +#include "strerror.h" +#include "select.h" /* for the socket readyness */ +#include "inet_pton.h" /* for IP addr SNI check */ #include "curl_multibyte.h" -#include "curl_warnless.h" +#include "warnless.h" #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> #include "curl_memory.h" /* The last #include file should be: */ -#include "curl_memdebug.h" +#include "memdebug.h" /* Uncomment to force verbose output * #define infof(x, y, ...) printf(y, __VA_ARGS__) diff --git a/lib/curl_schannel.h b/lib/curl_schannel.h index 918670fe0..37126ac7d 100644 --- a/lib/curl_schannel.h +++ b/lib/curl_schannel.h @@ -22,11 +22,11 @@ * KIND, either express or implied. * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #ifdef USE_SCHANNEL -#include "curl_urldata.h" +#include "urldata.h" #ifndef UNISP_NAME_A #define UNISP_NAME_A "Microsoft Unified Security Protocol Provider" diff --git a/lib/curl_sspi.c b/lib/curl_sspi.c index 40a0af1e4..c3c41ec2f 100644 --- a/lib/curl_sspi.c +++ b/lib/curl_sspi.c @@ -20,7 +20,7 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #ifdef USE_WINDOWS_SSPI @@ -33,7 +33,7 @@ #include "curl_memory.h" /* The last #include file should be: */ -#include "curl_memdebug.h" +#include "memdebug.h" /* We use our own typedef here since some headers might lack these */ typedef PSecurityFunctionTable (APIENTRY *INITSECURITYINTERFACE_FN)(VOID); diff --git a/lib/curl_sspi.h b/lib/curl_sspi.h index d52582856..c3e6d9760 100644 --- a/lib/curl_sspi.h +++ b/lib/curl_sspi.h @@ -22,7 +22,7 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #ifdef USE_WINDOWS_SSPI diff --git a/lib/curl_threads.c b/lib/curl_threads.c index 8bbf0af98..411ccc81d 100644 --- a/lib/curl_threads.c +++ b/lib/curl_threads.c @@ -20,7 +20,7 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #if defined(USE_THREADS_POSIX) # ifdef HAVE_PTHREAD_H @@ -39,7 +39,7 @@ #include "curl_memory.h" /* The last #include file should be: */ -#include "curl_memdebug.h" +#include "memdebug.h" #if defined(USE_THREADS_POSIX) diff --git a/lib/curl_threads.h b/lib/curl_threads.h index d9cec6b29..ba81054a2 100644 --- a/lib/curl_threads.h +++ b/lib/curl_threads.h @@ -21,7 +21,7 @@ * KIND, either express or implied. * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #if defined(USE_THREADS_POSIX) # define CURL_STDCALL diff --git a/lib/curlx.h b/lib/curlx.h index 42c62958d..9dc90a004 100644 --- a/lib/curlx.h +++ b/lib/curlx.h @@ -34,29 +34,29 @@ functions while they still are offered publicly. They will be made library- private one day */ -#include "curl_strequal.h" -/* "curl_strequal.h" provides the strequal protos */ +#include "strequal.h" +/* "strequal.h" provides the strequal protos */ -#include "curl_strtoofft.h" -/* "curl_strtoofft.h" provides this function: curlx_strtoofft(), returns a +#include "strtoofft.h" +/* "strtoofft.h" provides this function: curlx_strtoofft(), returns a curl_off_t number from a given string. */ -#include "curl_timeval.h" +#include "timeval.h" /* - "curl_timeval.h" sets up a 'struct timeval' even for platforms that - otherwise don't have one and has protos for these functions: + "timeval.h" sets up a 'struct timeval' even for platforms that otherwise + don't have one and has protos for these functions: curlx_tvnow() curlx_tvdiff() curlx_tvdiff_secs() */ -#include "curl_nonblock.h" -/* "curl_nonblock.h" provides curlx_nonblock() */ +#include "nonblock.h" +/* "nonblock.h" provides curlx_nonblock() */ -#include "curl_warnless.h" -/* "curl_warnless.h" provides functions: +#include "warnless.h" +/* "warnless.h" provides functions: curlx_ultous() curlx_ultouc() diff --git a/lib/curl_cyassl.c b/lib/cyassl.c index 32f1cfe5c..13c0d135d 100644 --- a/lib/curl_cyassl.c +++ b/lib/cyassl.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2012, 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,11 +22,11 @@ /* * Source file for all CyaSSL-specific code for the TLS/SSL layer. No code - * but curl_sslgen.c should ever call or use these functions. + * but sslgen.c should ever call or use these functions. * */ -#include "curl_setup.h" +#include "setup.h" #ifdef USE_CYASSL @@ -34,21 +34,21 @@ #include <limits.h> #endif -#include "curl_urldata.h" -#include "curl_sendf.h" -#include "curl_inet_pton.h" -#include "curl_cyassl.h" -#include "curl_sslgen.h" -#include "curl_parsedate.h" -#include "curl_connect.h" /* for the connect timeout */ -#include "curl_select.h" -#include "curl_rawstr.h" +#include "urldata.h" +#include "sendf.h" +#include "inet_pton.h" +#include "cyassl.h" +#include "sslgen.h" +#include "parsedate.h" +#include "connect.h" /* for the connect timeout */ +#include "select.h" +#include "rawstr.h" #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> #include "curl_memory.h" /* The last #include file should be: */ -#include "curl_memdebug.h" +#include "memdebug.h" #include <cyassl/ssl.h> #include <cyassl/error.h> diff --git a/lib/curl_cyassl.h b/lib/cyassl.h index 7728a0cf5..56d68066f 100644 --- a/lib/curl_cyassl.h +++ b/lib/cyassl.h @@ -21,7 +21,7 @@ * KIND, either express or implied. * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #ifdef USE_CYASSL diff --git a/lib/curl_dict.c b/lib/dict.c index 114ef7c72..ca5c362b1 100644 --- a/lib/curl_dict.c +++ b/lib/dict.c @@ -20,7 +20,7 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #ifndef CURL_DISABLE_DICT @@ -48,22 +48,22 @@ #include <sys/select.h> #endif -#include "curl_urldata.h" +#include "urldata.h" #include <curl/curl.h> -#include "curl_transfer.h" -#include "curl_sendf.h" +#include "transfer.h" +#include "sendf.h" -#include "curl_progress.h" -#include "curl_strequal.h" -#include "curl_dict.h" -#include "curl_rawstr.h" +#include "progress.h" +#include "strequal.h" +#include "dict.h" +#include "rawstr.h" #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> #include "curl_memory.h" /* The last #include file should be: */ -#include "curl_memdebug.h" +#include "memdebug.h" /* * Forward declarations. diff --git a/lib/curl_dict.h b/lib/dict.h index 44fd9d49d..44fd9d49d 100644 --- a/lib/curl_dict.h +++ b/lib/dict.h diff --git a/lib/curl_easy.c b/lib/easy.c index a2181cc4d..b73bf6601 100644 --- a/lib/curl_easy.c +++ b/lib/easy.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2012, 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 @@ -20,7 +20,7 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #ifdef HAVE_NETINET_IN_H #include <netinet/in.h> @@ -42,35 +42,35 @@ #include <sys/param.h> #endif -#include "curl_strequal.h" -#include "curl_urldata.h" +#include "strequal.h" +#include "urldata.h" #include <curl/curl.h> -#include "curl_transfer.h" -#include "curl_sslgen.h" -#include "curl_url.h" -#include "curl_getinfo.h" -#include "curl_hostip.h" -#include "curl_share.h" -#include "curl_strdup.h" +#include "transfer.h" +#include "sslgen.h" +#include "url.h" +#include "getinfo.h" +#include "hostip.h" +#include "share.h" +#include "strdup.h" #include "curl_memory.h" -#include "curl_progress.h" -#include "curl_easyif.h" -#include "curl_select.h" -#include "curl_sendf.h" /* for failf function prototype */ +#include "progress.h" +#include "easyif.h" +#include "select.h" +#include "sendf.h" /* for failf function prototype */ #include "curl_ntlm.h" -#include "curl_connect.h" /* for Curl_getconnectinfo */ -#include "curl_slist.h" -#include "curl_amigaos.h" +#include "connect.h" /* for Curl_getconnectinfo */ +#include "slist.h" +#include "amigaos.h" #include "curl_rand.h" -#include "curl_non_ascii.h" -#include "curl_warnless.h" -#include "curl_conncache.h" +#include "non-ascii.h" +#include "warnless.h" +#include "conncache.h" #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> /* The last #include file should be: */ -#include "curl_memdebug.h" +#include "memdebug.h" /* win32_cleanup() is for win32 socket cleanup functionality, the opposite of win32_init() */ diff --git a/lib/curl_easyif.h b/lib/easyif.h index ed744db08..1f521689f 100644 --- a/lib/curl_easyif.h +++ b/lib/easyif.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2011, 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 curl_easy.c + * Prototypes for library-wide functions provided by easy.c */ void Curl_easy_addmulti(struct SessionHandle *data, void *multi); diff --git a/lib/curl_escape.c b/lib/escape.c index c0ed571bd..0dd5a1d0a 100644 --- a/lib/curl_escape.c +++ b/lib/escape.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2011, 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,21 +23,21 @@ /* Escape and unescape URL encoding in strings. The functions return a new * allocated string or NULL if an error occurred. */ -#include "curl_setup.h" +#include "setup.h" #include <curl/curl.h> #include "curl_memory.h" -#include "curl_urldata.h" -#include "curl_warnless.h" -#include "curl_non_ascii.h" -#include "curl_escape.h" +#include "urldata.h" +#include "warnless.h" +#include "non-ascii.h" +#include "escape.h" #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> /* The last #include file should be: */ -#include "curl_memdebug.h" +#include "memdebug.h" /* Portable character check (remember EBCDIC). Do not use isalnum() because its behavior is altered by the current locale. diff --git a/lib/curl_escape.h b/lib/escape.h index 731b13655..731b13655 100644 --- a/lib/curl_escape.h +++ b/lib/escape.h diff --git a/lib/curl_file.c b/lib/file.c index 6ea2bd769..886a09e24 100644 --- a/lib/curl_file.c +++ b/lib/file.c @@ -20,7 +20,7 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #ifndef CURL_DISABLE_FILE @@ -48,26 +48,26 @@ #include <fcntl.h> #endif -#include "curl_strtoofft.h" -#include "curl_urldata.h" +#include "strtoofft.h" +#include "urldata.h" #include <curl/curl.h> -#include "curl_progress.h" -#include "curl_sendf.h" -#include "curl_escape.h" -#include "curl_file.h" -#include "curl_speedcheck.h" -#include "curl_getinfo.h" -#include "curl_transfer.h" -#include "curl_url.h" +#include "progress.h" +#include "sendf.h" +#include "escape.h" +#include "file.h" +#include "speedcheck.h" +#include "getinfo.h" +#include "transfer.h" +#include "url.h" #include "curl_memory.h" -#include "curl_parsedate.h" /* for the week day and month names */ -#include "curl_warnless.h" +#include "parsedate.h" /* for the week day and month names */ +#include "warnless.h" #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> /* The last #include file should be: */ -#include "curl_memdebug.h" +#include "memdebug.h" #if defined(WIN32) || defined(MSDOS) || defined(__EMX__) || \ defined(__SYMBIAN32__) diff --git a/lib/curl_file.h b/lib/file.h index 997474bc7..997474bc7 100644 --- a/lib/curl_file.h +++ b/lib/file.h diff --git a/lib/curl_fileinfo.c b/lib/fileinfo.c index 433c709b5..4ffcbbe29 100644 --- a/lib/curl_fileinfo.c +++ b/lib/fileinfo.c @@ -20,17 +20,17 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" -#include "curl_strdup.h" -#include "curl_fileinfo.h" +#include "strdup.h" +#include "fileinfo.h" #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> #include "curl_memory.h" /* The last #include file should be: */ -#include "curl_memdebug.h" +#include "memdebug.h" struct curl_fileinfo *Curl_fileinfo_alloc(void) { diff --git a/lib/curl_fileinfo.h b/lib/fileinfo.h index b0e5e59e1..b0e5e59e1 100644 --- a/lib/curl_fileinfo.h +++ b/lib/fileinfo.h diff --git a/lib/curl_formdata.c b/lib/formdata.c index c7d85c4b4..7bf883941 100644 --- a/lib/curl_formdata.c +++ b/lib/formdata.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2012, 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 @@ -20,7 +20,7 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #include <curl/curl.h> @@ -33,18 +33,18 @@ #include <libgen.h> #endif -#include "curl_urldata.h" /* for struct SessionHandle */ -#include "curl_formdata.h" +#include "urldata.h" /* for struct SessionHandle */ +#include "formdata.h" #include "curl_rand.h" -#include "curl_strequal.h" +#include "strequal.h" #include "curl_memory.h" -#include "curl_sendf.h" +#include "sendf.h" #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> /* The last #include file should be: */ -#include "curl_memdebug.h" +#include "memdebug.h" #endif /* !defined(CURL_DISABLE_HTTP) || defined(USE_SSLEAY) */ @@ -857,8 +857,8 @@ static CURLcode AddFormDataf(struct FormData **formp, } /* - * Curl_formclean() is used from curl_http.c, this cleans a built FormData - * linked list + * Curl_formclean() is used from http.c, this cleans a built FormData linked + * list */ void Curl_formclean(struct FormData **form_ptr) { diff --git a/lib/curl_formdata.h b/lib/formdata.h index 22f504bb3..22f504bb3 100644 --- a/lib/curl_formdata.h +++ b/lib/formdata.h diff --git a/lib/curl_ftp.c b/lib/ftp.c index 653e30b66..dc24d0bb5 100644 --- a/lib/curl_ftp.c +++ b/lib/ftp.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2012, 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 @@ -20,7 +20,7 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #ifndef CURL_DISABLE_FTP @@ -47,47 +47,47 @@ #endif #include <curl/curl.h> -#include "curl_urldata.h" -#include "curl_sendf.h" -#include "curl_if2ip.h" -#include "curl_hostip.h" -#include "curl_progress.h" -#include "curl_transfer.h" -#include "curl_escape.h" -#include "curl_http.h" /* for HTTP proxy tunnel stuff */ -#include "curl_socks.h" -#include "curl_ftp.h" -#include "curl_fileinfo.h" -#include "curl_ftplistparser.h" +#include "urldata.h" +#include "sendf.h" +#include "if2ip.h" +#include "hostip.h" +#include "progress.h" +#include "transfer.h" +#include "escape.h" +#include "http.h" /* for HTTP proxy tunnel stuff */ +#include "socks.h" +#include "ftp.h" +#include "fileinfo.h" +#include "ftplistparser.h" #if defined(HAVE_KRB4) || defined(HAVE_GSSAPI) -#include "curl_krb4.h" +#include "krb4.h" #endif -#include "curl_strtoofft.h" -#include "curl_strequal.h" -#include "curl_sslgen.h" -#include "curl_connect.h" -#include "curl_strerror.h" -#include "curl_inet_ntop.h" -#include "curl_inet_pton.h" -#include "curl_select.h" -#include "curl_parsedate.h" /* for the week day and month names */ -#include "curl_sockaddr.h" /* required for Curl_sockaddr_storage */ -#include "curl_multiif.h" -#include "curl_url.h" -#include "curl_rawstr.h" -#include "curl_speedcheck.h" -#include "curl_warnless.h" -#include "curl_http_proxy.h" -#include "curl_non_ascii.h" +#include "strtoofft.h" +#include "strequal.h" +#include "sslgen.h" +#include "connect.h" +#include "strerror.h" +#include "inet_ntop.h" +#include "inet_pton.h" +#include "select.h" +#include "parsedate.h" /* for the week day and month names */ +#include "sockaddr.h" /* required for Curl_sockaddr_storage */ +#include "multiif.h" +#include "url.h" +#include "rawstr.h" +#include "speedcheck.h" +#include "warnless.h" +#include "http_proxy.h" +#include "non-ascii.h" #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> #include "curl_memory.h" /* The last #include file should be: */ -#include "curl_memdebug.h" +#include "memdebug.h" #ifndef NI_MAXHOST #define NI_MAXHOST 1025 @@ -3109,7 +3109,7 @@ static CURLcode ftp_statemach_act(struct connectdata *conn) } -/* called repeatedly until done from curl_multi.c */ +/* called repeatedly until done from 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 curl_multi.c while DOing */ +/* called from multi.c while DOing */ static CURLcode ftp_doing(struct connectdata *conn, bool *dophase_done) { diff --git a/lib/curl_ftp.h b/lib/ftp.h index 7e5026792..d359f28f3 100644 --- a/lib/curl_ftp.h +++ b/lib/ftp.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2011, 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 @@ * ***************************************************************************/ -#include "curl_pingpong.h" +#include "pingpong.h" #ifndef CURL_DISABLE_FTP extern const struct Curl_handler Curl_handler_ftp; @@ -79,7 +79,7 @@ typedef enum { FTP_LAST /* never used */ } ftpstate; -struct ftp_parselist_data; /* defined later in curl_ftplistparser.c */ +struct ftp_parselist_data; /* defined later in 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 curl_ftp.c:state() to change state! */ + ftpstate state; /* always use 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_ftplistparser.c b/lib/ftplistparser.c index a1a7d5187..49ee4b6a6 100644 --- a/lib/curl_ftplistparser.c +++ b/lib/ftplistparser.c @@ -35,19 +35,19 @@ * 01-29-97 11:32PM <DIR> prog */ -#include "curl_setup.h" +#include "setup.h" #ifndef CURL_DISABLE_FTP #include <curl/curl.h> -#include "curl_urldata.h" -#include "curl_fileinfo.h" -#include "curl_llist.h" -#include "curl_strtoofft.h" -#include "curl_rawstr.h" -#include "curl_ftp.h" -#include "curl_ftplistparser.h" +#include "urldata.h" +#include "fileinfo.h" +#include "llist.h" +#include "strtoofft.h" +#include "rawstr.h" +#include "ftp.h" +#include "ftplistparser.h" #include "curl_fnmatch.h" #define _MPRINTF_REPLACE /* use our functions only */ @@ -55,7 +55,7 @@ #include "curl_memory.h" /* The last #include file should be: */ -#include "curl_memdebug.h" +#include "memdebug.h" /* allocs buffer which will contain one line of LIST command response */ #define FTP_BUFFER_ALLOCSIZE 160 diff --git a/lib/curl_ftplistparser.h b/lib/ftplistparser.h index 96764e2a4..8499ccda4 100644 --- a/lib/curl_ftplistparser.h +++ b/lib/ftplistparser.h @@ -21,7 +21,7 @@ * KIND, either express or implied. * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #ifndef CURL_DISABLE_FTP diff --git a/lib/curl_getenv.c b/lib/getenv.c index cf8b03619..a2d69830e 100644 --- a/lib/curl_getenv.c +++ b/lib/getenv.c @@ -20,7 +20,7 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #ifdef __VMS #include <unixlib.h> @@ -29,7 +29,7 @@ #include <curl/curl.h> #include "curl_memory.h" -#include "curl_memdebug.h" +#include "memdebug.h" static char *GetEnv(const char *variable) diff --git a/lib/curl_getinfo.c b/lib/getinfo.c index 0404c28ea..221f05a4f 100644 --- a/lib/curl_getinfo.c +++ b/lib/getinfo.c @@ -20,20 +20,20 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #include <curl/curl.h> -#include "curl_urldata.h" -#include "curl_getinfo.h" +#include "urldata.h" +#include "getinfo.h" #include "curl_memory.h" -#include "curl_sslgen.h" -#include "curl_connect.h" /* Curl_getconnectinfo() */ -#include "curl_progress.h" +#include "sslgen.h" +#include "connect.h" /* Curl_getconnectinfo() */ +#include "progress.h" /* Make this the last #include */ -#include "curl_memdebug.h" +#include "memdebug.h" /* * This is supposed to be called in the beginning of a perform() session diff --git a/lib/curl_getinfo.h b/lib/getinfo.h index 3879ff73a..3879ff73a 100644 --- a/lib/curl_getinfo.h +++ b/lib/getinfo.h diff --git a/lib/curl_gopher.c b/lib/gopher.c index 80fc18e8e..e8f2790fc 100644 --- a/lib/curl_gopher.c +++ b/lib/gopher.c @@ -20,29 +20,29 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #ifndef CURL_DISABLE_GOPHER -#include "curl_urldata.h" +#include "urldata.h" #include <curl/curl.h> -#include "curl_transfer.h" -#include "curl_sendf.h" +#include "transfer.h" +#include "sendf.h" -#include "curl_progress.h" -#include "curl_strequal.h" -#include "curl_gopher.h" -#include "curl_rawstr.h" -#include "curl_select.h" -#include "curl_url.h" -#include "curl_warnless.h" +#include "progress.h" +#include "strequal.h" +#include "gopher.h" +#include "rawstr.h" +#include "select.h" +#include "url.h" +#include "warnless.h" #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> #include "curl_memory.h" /* The last #include file should be: */ -#include "curl_memdebug.h" +#include "memdebug.h" /* * Forward declarations. diff --git a/lib/curl_gopher.h b/lib/gopher.h index 38bbc4b73..38bbc4b73 100644 --- a/lib/curl_gopher.h +++ b/lib/gopher.h diff --git a/lib/curl_gtls.c b/lib/gtls.c index 5c9d165e7..8c2a4a0c9 100644 --- a/lib/curl_gtls.c +++ b/lib/gtls.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2012, 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,13 +22,13 @@ /* * Source file for all GnuTLS-specific code for the TLS/SSL layer. No code - * but curl_sslgen.c should ever call or use these functions. + * but 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. */ -#include "curl_setup.h" +#include "setup.h" #ifdef USE_GNUTLS @@ -42,21 +42,21 @@ #include <gcrypt.h> #endif -#include "curl_urldata.h" -#include "curl_sendf.h" -#include "curl_inet_pton.h" -#include "curl_gtls.h" -#include "curl_sslgen.h" -#include "curl_parsedate.h" -#include "curl_connect.h" /* for the connect timeout */ -#include "curl_select.h" -#include "curl_rawstr.h" +#include "urldata.h" +#include "sendf.h" +#include "inet_pton.h" +#include "gtls.h" +#include "sslgen.h" +#include "parsedate.h" +#include "connect.h" /* for the connect timeout */ +#include "select.h" +#include "rawstr.h" #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> #include "curl_memory.h" /* The last #include file should be: */ -#include "curl_memdebug.h" +#include "memdebug.h" /* Some hackish cast macros based on: @@ -94,7 +94,7 @@ static bool gtls_inited = FALSE; /* * Custom push and pull callback functions used by GNU TLS to read and write * to the socket. These functions are simple wrappers to send() and recv() - * (although here using sread/swrite macros as defined by curl_setup_once.h). + * (although here using the sread/swrite macros as defined by setup_once.h). * We use custom functions rather than the GNU TLS defaults because it allows * us to get specific about the fourth "flags" argument, and to use arbitrary * private data with gnutls_transport_set_ptr if we wish. diff --git a/lib/curl_gtls.h b/lib/gtls.h index 83cfac7fd..45b755a0e 100644 --- a/lib/curl_gtls.h +++ b/lib/gtls.h @@ -22,11 +22,11 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #ifdef USE_GNUTLS -#include "curl_urldata.h" +#include "urldata.h" int Curl_gtls_init(void); int Curl_gtls_cleanup(void); diff --git a/lib/curl_hash.c b/lib/hash.c index 732dbcf73..b59e56146 100644 --- a/lib/curl_hash.c +++ b/lib/hash.c @@ -20,17 +20,17 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" -#include "curl_hash.h" -#include "curl_llist.h" +#include "hash.h" +#include "llist.h" #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> #include "curl_memory.h" /* The last #include file should be: */ -#include "curl_memdebug.h" +#include "memdebug.h" static void hash_element_dtor(void *user, void *element) diff --git a/lib/curl_hash.h b/lib/hash.h index 68e7933ab..3fa621cb1 100644 --- a/lib/curl_hash.h +++ b/lib/hash.h @@ -22,11 +22,11 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #include <stddef.h> -#include "curl_llist.h" +#include "llist.h" /* Hash function prototype */ typedef size_t (*hash_function) (void* key, diff --git a/lib/curl_hmac.c b/lib/hmac.c index 692d27940..4df6f79ad 100644 --- a/lib/curl_hmac.c +++ b/lib/hmac.c @@ -22,7 +22,7 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #ifndef CURL_DISABLE_CRYPTO_AUTH @@ -33,7 +33,7 @@ #include "curl_memory.h" /* The last #include file should be: */ -#include "curl_memdebug.h" +#include "memdebug.h" /* * Generic HMAC algorithm. diff --git a/lib/curl_hostasyn.c b/lib/hostasyn.c index 0097b6cfd..93e2c31cd 100644 --- a/lib/curl_hostasyn.c +++ b/lib/hostasyn.c @@ -20,7 +20,7 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #ifdef HAVE_NETINET_IN_H #include <netinet/in.h> @@ -40,20 +40,20 @@ #include <process.h> #endif -#include "curl_urldata.h" -#include "curl_sendf.h" -#include "curl_hostip.h" -#include "curl_hash.h" -#include "curl_share.h" -#include "curl_strerror.h" -#include "curl_url.h" +#include "urldata.h" +#include "sendf.h" +#include "hostip.h" +#include "hash.h" +#include "share.h" +#include "strerror.h" +#include "url.h" #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> #include "curl_memory.h" /* The last #include file should be: */ -#include "curl_memdebug.h" +#include "memdebug.h" /*********************************************************************** * Only for builds using asynchronous name resolves diff --git a/lib/curl_hostcheck.c b/lib/hostcheck.c index a5bf8b02f..8affce044 100644 --- a/lib/curl_hostcheck.c +++ b/lib/hostcheck.c @@ -20,13 +20,13 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #if defined(USE_SSLEAY) || defined(USE_AXTLS) /* these two backends use functions from this file */ -#include "curl_hostcheck.h" -#include "curl_rawstr.h" +#include "hostcheck.h" +#include "rawstr.h" /* * Match a hostname against a wildcard pattern. diff --git a/lib/curl_hostcheck.h b/lib/hostcheck.h index f4a517a8e..f4a517a8e 100644 --- a/lib/curl_hostcheck.h +++ b/lib/hostcheck.h diff --git a/lib/curl_hostip.c b/lib/hostip.c index 7cc51f899..2bfb74b42 100644 --- a/lib/curl_hostip.c +++ b/lib/hostip.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2012, 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 @@ -20,7 +20,7 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #ifdef HAVE_NETINET_IN_H #include <netinet/in.h> @@ -47,22 +47,22 @@ #include <process.h> #endif -#include "curl_urldata.h" -#include "curl_sendf.h" -#include "curl_hostip.h" -#include "curl_hash.h" -#include "curl_share.h" -#include "curl_strerror.h" -#include "curl_url.h" -#include "curl_inet_ntop.h" -#include "curl_warnless.h" +#include "urldata.h" +#include "sendf.h" +#include "hostip.h" +#include "hash.h" +#include "share.h" +#include "strerror.h" +#include "url.h" +#include "inet_ntop.h" +#include "warnless.h" #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> #include "curl_memory.h" /* The last #include file should be: */ -#include "curl_memdebug.h" +#include "memdebug.h" #if defined(CURLRES_SYNCH) && \ defined(HAVE_ALARM) && defined(SIGALRM) && defined(HAVE_SIGSETJMP) @@ -71,10 +71,10 @@ #endif /* - * curl_hostip.c explained - * ======================= + * hostip.c explained + * ================== * - * The main COMPILE-TIME DEFINES to keep in mind when reading the curl_host*.c + * The main COMPILE-TIME DEFINES to keep in mind when reading the host*.c * source file are these: * * CURLRES_IPV6 - this host has getaddrinfo() and family, and thus we use @@ -93,20 +93,20 @@ * libcurl is not built to use an asynchronous resolver, CURLRES_SYNCH is * defined. * - * The curl_host*.c sources files are split up like this: + * The host*.c sources files are split up like this: * - * 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 + * 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 * * The two asynchronous name resolver backends are implemented in: - * curl_asyn_ares.c - functions for ares-using name resolves - * curl_asyn_thread.c - functions for threaded name resolves + * asyn-ares.c - functions for ares-using name resolves + * 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. + * The hostip.h is the united header file for all this. It defines the + * CURLRES_* defines based on the config*.h and setup.h defines. */ /* These two symbols are for the global DNS cache */ diff --git a/lib/curl_hostip.h b/lib/hostip.h index 30c738d72..de71f54f4 100644 --- a/lib/curl_hostip.h +++ b/lib/hostip.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2012, 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,10 +22,10 @@ * ***************************************************************************/ -#include "curl_setup.h" -#include "curl_hash.h" +#include "setup.h" +#include "hash.h" #include "curl_addrinfo.h" -#include "curl_asyn.h" +#include "asyn.h" #ifdef HAVE_SETJMP_H #include <setjmp.h> @@ -187,7 +187,7 @@ Curl_cache_addr(struct SessionHandle *data, Curl_addrinfo *addr, #endif #ifdef HAVE_SIGSETJMP -/* Forward-declaration of variable defined in curl_hostip.c. Beware this +/* Forward-declaration of variable defined in 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_hostip4.c b/lib/hostip4.c index 5b64b4673..3babe7269 100644 --- a/lib/curl_hostip4.c +++ b/lib/hostip4.c @@ -20,7 +20,7 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #ifdef HAVE_NETINET_IN_H #include <netinet/in.h> @@ -40,21 +40,21 @@ #include <process.h> #endif -#include "curl_urldata.h" -#include "curl_sendf.h" -#include "curl_hostip.h" -#include "curl_hash.h" -#include "curl_share.h" -#include "curl_strerror.h" -#include "curl_url.h" -#include "curl_inet_pton.h" +#include "urldata.h" +#include "sendf.h" +#include "hostip.h" +#include "hash.h" +#include "share.h" +#include "strerror.h" +#include "url.h" +#include "inet_pton.h" #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> #include "curl_memory.h" /* The last #include file should be: */ -#include "curl_memdebug.h" +#include "memdebug.h" /*********************************************************************** * Only for plain-ipv4 builds diff --git a/lib/curl_hostip6.c b/lib/hostip6.c index cfd6081c1..5b25d6fc4 100644 --- a/lib/curl_hostip6.c +++ b/lib/hostip6.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2012, 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 @@ -20,7 +20,7 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #ifdef HAVE_NETINET_IN_H #include <netinet/in.h> @@ -40,22 +40,22 @@ #include <process.h> #endif -#include "curl_urldata.h" -#include "curl_sendf.h" -#include "curl_hostip.h" -#include "curl_hash.h" -#include "curl_share.h" -#include "curl_strerror.h" -#include "curl_url.h" -#include "curl_inet_pton.h" -#include "curl_connect.h" +#include "urldata.h" +#include "sendf.h" +#include "hostip.h" +#include "hash.h" +#include "share.h" +#include "strerror.h" +#include "url.h" +#include "inet_pton.h" +#include "connect.h" #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> #include "curl_memory.h" /* The last #include file should be: */ -#include "curl_memdebug.h" +#include "memdebug.h" /*********************************************************************** * Only for ipv6-enabled builds @@ -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 curl_memdebug.c. I put these ones here since - * they require a bunch of structs I didn't want to include there. + * 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 */ /* diff --git a/lib/curl_hostsyn.c b/lib/hostsyn.c index 9a26f8d44..eff2efa7b 100644 --- a/lib/curl_hostsyn.c +++ b/lib/hostsyn.c @@ -20,7 +20,7 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #ifdef HAVE_NETINET_IN_H #include <netinet/in.h> @@ -40,20 +40,20 @@ #include <process.h> #endif -#include "curl_urldata.h" -#include "curl_sendf.h" -#include "curl_hostip.h" -#include "curl_hash.h" -#include "curl_share.h" -#include "curl_strerror.h" -#include "curl_url.h" +#include "urldata.h" +#include "sendf.h" +#include "hostip.h" +#include "hash.h" +#include "share.h" +#include "strerror.h" +#include "url.h" #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> #include "curl_memory.h" /* The last #include file should be: */ -#include "curl_memdebug.h" +#include "memdebug.h" /*********************************************************************** * Only for builds using synchronous name resolves diff --git a/lib/curl_http.c b/lib/http.c index 420361c76..0013e5065 100644 --- a/lib/curl_http.c +++ b/lib/http.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2012, 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 @@ -20,7 +20,7 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #ifndef CURL_DISABLE_HTTP @@ -45,40 +45,40 @@ #include <sys/param.h> #endif -#include "curl_urldata.h" +#include "urldata.h" #include <curl/curl.h> -#include "curl_transfer.h" -#include "curl_sendf.h" -#include "curl_formdata.h" -#include "curl_progress.h" +#include "transfer.h" +#include "sendf.h" +#include "formdata.h" +#include "progress.h" #include "curl_base64.h" -#include "curl_cookie.h" -#include "curl_strequal.h" -#include "curl_sslgen.h" -#include "curl_http_digest.h" +#include "cookie.h" +#include "strequal.h" +#include "sslgen.h" +#include "http_digest.h" #include "curl_ntlm.h" #include "curl_ntlm_wb.h" -#include "curl_http_negotiate.h" -#include "curl_url.h" -#include "curl_share.h" -#include "curl_hostip.h" -#include "curl_http.h" +#include "http_negotiate.h" +#include "url.h" +#include "share.h" +#include "hostip.h" +#include "http.h" #include "curl_memory.h" -#include "curl_select.h" -#include "curl_parsedate.h" /* for the week day and month names */ -#include "curl_strtoofft.h" -#include "curl_multiif.h" -#include "curl_rawstr.h" -#include "curl_content_encoding.h" -#include "curl_http_proxy.h" -#include "curl_warnless.h" -#include "curl_non_ascii.h" +#include "select.h" +#include "parsedate.h" /* for the week day and month names */ +#include "strtoofft.h" +#include "multiif.h" +#include "rawstr.h" +#include "content_encoding.h" +#include "http_proxy.h" +#include "warnless.h" +#include "non-ascii.h" #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> /* The last #include file should be: */ -#include "curl_memdebug.h" +#include "memdebug.h" /* * Forward declarations. @@ -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 curl_transfer.c main loop and in - * the proxy CONNECT loop. + * headers. They are dealt with both in the 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 - * curl_transfer.c loop when more data is to be sent to the peer. + * 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 curl_formdata.c) is sent later */ + /* this header (extended by 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 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. */ + /* 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. */ if(Curl_checkheaders(data, "User-Agent:") && conn->allocptr.uagent) { free(conn->allocptr.uagent); conn->allocptr.uagent=NULL; diff --git a/lib/curl_http.h b/lib/http.h index f654689d5..7236dd88c 100644 --- a/lib/curl_http.h +++ b/lib/http.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2011, 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 curl_http_chunks.c */ +/* The following functions are defined in 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 curl_http.c */ +/* These functions are in 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_http_chunks.c b/lib/http_chunks.c index 2112f72ec..d6a0bec13 100644 --- a/lib/curl_http_chunks.c +++ b/lib/http_chunks.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2011, 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 @@ -20,23 +20,23 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #ifndef CURL_DISABLE_HTTP -#include "curl_urldata.h" /* it includes curl_http_chunks.h */ -#include "curl_sendf.h" /* for the client write stuff */ +#include "urldata.h" /* it includes http_chunks.h */ +#include "sendf.h" /* for the client write stuff */ -#include "curl_content_encoding.h" -#include "curl_http.h" +#include "content_encoding.h" +#include "http.h" #include "curl_memory.h" -#include "curl_non_ascii.h" /* for Curl_convert_to_network prototype */ +#include "non-ascii.h" /* for Curl_convert_to_network prototype */ #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> /* The last #include file should be: */ -#include "curl_memdebug.h" +#include "memdebug.h" /* * Chunk format (simplified): @@ -315,7 +315,7 @@ CHUNKcode Curl_httpchunk_read(struct connectdata *conn, } } else { - /* conn->trailer is assumed to be freed in curl_url.c on a + /* conn->trailer is assumed to be freed in 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/curl_http_chunks.h b/lib/http_chunks.h index b999ab53b..b999ab53b 100644 --- a/lib/curl_http_chunks.h +++ b/lib/http_chunks.h diff --git a/lib/curl_http_digest.c b/lib/http_digest.c index dae679903..17cc95e81 100644 --- a/lib/curl_http_digest.c +++ b/lib/http_digest.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2012, 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 @@ -20,27 +20,27 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_CRYPTO_AUTH) -#include "curl_urldata.h" -#include "curl_sendf.h" -#include "curl_rawstr.h" +#include "urldata.h" +#include "sendf.h" +#include "rawstr.h" #include "curl_base64.h" #include "curl_md5.h" -#include "curl_http_digest.h" -#include "curl_strtok.h" -#include "curl_url.h" +#include "http_digest.h" +#include "strtok.h" +#include "url.h" /* for Curl_safefree() */ #include "curl_memory.h" -#include "curl_non_ascii.h" /* included for Curl_convert_... prototypes */ -#include "curl_warnless.h" +#include "non-ascii.h" /* included for Curl_convert_... prototypes */ +#include "warnless.h" #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> /* The last #include file should be: */ -#include "curl_memdebug.h" +#include "memdebug.h" #define MAX_VALUE_LENGTH 256 #define MAX_CONTENT_LENGTH 1024 diff --git a/lib/curl_http_digest.h b/lib/http_digest.h index c6a4e9161..3b22ce10e 100644 --- a/lib/curl_http_digest.h +++ b/lib/http_digest.h @@ -21,7 +21,7 @@ * KIND, either express or implied. * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" typedef enum { CURLDIGEST_NONE, /* not a digest */ diff --git a/lib/curl_http_negotiate.c b/lib/http_negotiate.c index 446c49bb9..92c363d7c 100644 --- a/lib/curl_http_negotiate.c +++ b/lib/http_negotiate.c @@ -20,7 +20,7 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #ifdef HAVE_GSSAPI #ifdef HAVE_OLD_GSSMIT @@ -30,14 +30,14 @@ #ifndef CURL_DISABLE_HTTP -#include "curl_urldata.h" -#include "curl_sendf.h" +#include "urldata.h" +#include "sendf.h" #include "curl_gssapi.h" -#include "curl_rawstr.h" +#include "rawstr.h" #include "curl_base64.h" -#include "curl_http_negotiate.h" +#include "http_negotiate.h" #include "curl_memory.h" -#include "curl_url.h" +#include "url.h" #ifdef HAVE_SPNEGO # include <spnegohelp.h> @@ -56,7 +56,7 @@ #include <curl/mprintf.h> /* The last #include file should be: */ -#include "curl_memdebug.h" +#include "memdebug.h" static int get_gss_name(struct connectdata *conn, bool proxy, gss_name_t *server) diff --git a/lib/curl_http_negotiate.h b/lib/http_negotiate.h index e584d76fc..e584d76fc 100644 --- a/lib/curl_http_negotiate.h +++ b/lib/http_negotiate.h diff --git a/lib/curl_http_negotiate_sspi.c b/lib/http_negotiate_sspi.c index d82b27110..5aa4f9433 100644 --- a/lib/curl_http_negotiate_sspi.c +++ b/lib/http_negotiate_sspi.c @@ -20,18 +20,18 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #ifdef USE_WINDOWS_SSPI #ifndef CURL_DISABLE_HTTP -#include "curl_urldata.h" -#include "curl_sendf.h" -#include "curl_rawstr.h" -#include "curl_warnless.h" +#include "urldata.h" +#include "sendf.h" +#include "rawstr.h" +#include "warnless.h" #include "curl_base64.h" -#include "curl_http_negotiate.h" +#include "http_negotiate.h" #include "curl_memory.h" #include "curl_multibyte.h" @@ -39,7 +39,7 @@ #include <curl/mprintf.h> /* The last #include file should be: */ -#include "curl_memdebug.h" +#include "memdebug.h" static int get_gss_name(struct connectdata *conn, bool proxy, diff --git a/lib/curl_http_proxy.c b/lib/http_proxy.c index 14ef9dc1e..d2e1aa199 100644 --- a/lib/curl_http_proxy.c +++ b/lib/http_proxy.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2012, 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 @@ -20,21 +20,21 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #if !defined(CURL_DISABLE_PROXY) && !defined(CURL_DISABLE_HTTP) -#include "curl_urldata.h" +#include "urldata.h" #include <curl/curl.h> -#include "curl_http_proxy.h" -#include "curl_sendf.h" -#include "curl_http.h" -#include "curl_url.h" -#include "curl_select.h" -#include "curl_rawstr.h" -#include "curl_progress.h" -#include "curl_non_ascii.h" -#include "curl_connect.h" +#include "http_proxy.h" +#include "sendf.h" +#include "http.h" +#include "url.h" +#include "select.h" +#include "rawstr.h" +#include "progress.h" +#include "non-ascii.h" +#include "connect.h" #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> @@ -43,7 +43,7 @@ #include "curl_memory.h" /* The last #include file should be: */ -#include "curl_memdebug.h" +#include "memdebug.h" CURLcode Curl_proxy_connect(struct connectdata *conn) { diff --git a/lib/curl_http_proxy.h b/lib/http_proxy.h index 518c09383..518c09383 100644 --- a/lib/curl_http_proxy.h +++ b/lib/http_proxy.h diff --git a/lib/curl_idn_win32.c b/lib/idn_win32.c index eca225483..9bc9cb810 100644 --- a/lib/curl_idn_win32.c +++ b/lib/idn_win32.c @@ -24,7 +24,7 @@ * IDN conversions using Windows kernel32 and normaliz libraries. */ -#include "curl_setup.h" +#include "setup.h" #ifdef USE_WIN32_IDN @@ -32,7 +32,7 @@ #include "curl_memory.h" /* The last #include file should be: */ -#include "curl_memdebug.h" +#include "memdebug.h" #ifdef WANT_IDN_PROTOTYPES WINBASEAPI int WINAPI IdnToAscii(DWORD, const WCHAR *, int, WCHAR *, int); diff --git a/lib/curl_if2ip.c b/lib/if2ip.c index db9c78446..c1905d175 100644 --- a/lib/curl_if2ip.c +++ b/lib/if2ip.c @@ -20,7 +20,7 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #ifdef HAVE_NETINET_IN_H # include <netinet/in.h> @@ -50,16 +50,16 @@ # include <inet.h> #endif -#include "curl_inet_ntop.h" -#include "curl_strequal.h" -#include "curl_if2ip.h" +#include "inet_ntop.h" +#include "strequal.h" +#include "if2ip.h" #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> #include "curl_memory.h" /* The last #include file should be: */ -#include "curl_memdebug.h" +#include "memdebug.h" /* ------------------------------------------------------------------ */ diff --git a/lib/curl_if2ip.h b/lib/if2ip.h index 858ec2f5b..70842457c 100644 --- a/lib/curl_if2ip.h +++ b/lib/if2ip.h @@ -21,7 +21,7 @@ * KIND, either express or implied. * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" bool Curl_if_is_interface_name(const char *interf); char *Curl_if2ip(int af, const char *interf, char *buf, int buf_size); diff --git a/lib/curl_imap.c b/lib/imap.c index 8175daa1a..ab11464fb 100644 --- a/lib/curl_imap.c +++ b/lib/imap.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2012, 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 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #ifndef CURL_DISABLE_IMAP @@ -50,33 +50,33 @@ #endif #include <curl/curl.h> -#include "curl_urldata.h" -#include "curl_sendf.h" -#include "curl_if2ip.h" -#include "curl_hostip.h" -#include "curl_progress.h" -#include "curl_transfer.h" -#include "curl_escape.h" -#include "curl_http.h" /* for HTTP proxy tunnel stuff */ -#include "curl_socks.h" -#include "curl_imap.h" - -#include "curl_strtoofft.h" -#include "curl_strequal.h" -#include "curl_sslgen.h" -#include "curl_connect.h" -#include "curl_strerror.h" -#include "curl_select.h" -#include "curl_multiif.h" -#include "curl_url.h" -#include "curl_rawstr.h" +#include "urldata.h" +#include "sendf.h" +#include "if2ip.h" +#include "hostip.h" +#include "progress.h" +#include "transfer.h" +#include "escape.h" +#include "http.h" /* for HTTP proxy tunnel stuff */ +#include "socks.h" +#include "imap.h" + +#include "strtoofft.h" +#include "strequal.h" +#include "sslgen.h" +#include "connect.h" +#include "strerror.h" +#include "select.h" +#include "multiif.h" +#include "url.h" +#include "rawstr.h" #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> #include "curl_memory.h" /* The last #include file should be: */ -#include "curl_memdebug.h" +#include "memdebug.h" /* Local API functions */ static CURLcode imap_parse_url_path(struct connectdata *conn); @@ -718,7 +718,7 @@ static CURLcode imap_statemach_act(struct connectdata *conn) return result; } -/* Called repeatedly until done from curl_multi.c */ +/* Called repeatedly until done from 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 curl_multi.c while DOing */ +/* Called from 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/curl_imap.h b/lib/imap.h index 62fb126a5..4cd6bc76a 100644 --- a/lib/curl_imap.h +++ b/lib/imap.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 2009 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 2009 - 2012, 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 @@ * ***************************************************************************/ -#include "curl_pingpong.h" +#include "pingpong.h" /**************************************************************************** * IMAP unique setup @@ -46,7 +46,7 @@ typedef enum { struct imap_conn { struct pingpong pp; char *mailbox; /* Message ID to fetch */ - imapstate state; /* Always use curl_imap.c:state() to change state! */ + imapstate state; /* Always use 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_inet_ntop.c b/lib/inet_ntop.c index b184029f6..1ff975667 100644 --- a/lib/curl_inet_ntop.c +++ b/lib/inet_ntop.c @@ -18,7 +18,7 @@ * Original code by Paul Vixie. "curlified" by Gisle Vanem. */ -#include "curl_setup.h" +#include "setup.h" #ifndef HAVE_INET_NTOP @@ -35,7 +35,7 @@ #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> -#include "curl_inet_ntop.h" +#include "inet_ntop.h" #define IN6ADDRSZ 16 #define INADDRSZ 4 diff --git a/lib/curl_inet_ntop.h b/lib/inet_ntop.h index db28ed807..dbc146d91 100644 --- a/lib/curl_inet_ntop.h +++ b/lib/inet_ntop.h @@ -22,7 +22,7 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" char *Curl_inet_ntop(int af, const void *addr, char *buf, size_t size); diff --git a/lib/curl_inet_pton.c b/lib/inet_pton.c index 175f938cd..d7fbbe957 100644 --- a/lib/curl_inet_pton.c +++ b/lib/inet_pton.c @@ -16,7 +16,7 @@ * SOFTWARE. */ -#include "curl_setup.h" +#include "setup.h" #ifndef HAVE_INET_PTON @@ -30,7 +30,7 @@ #include <arpa/inet.h> #endif -#include "curl_inet_pton.h" +#include "inet_pton.h" #define IN6ADDRSZ 16 #define INADDRSZ 4 diff --git a/lib/curl_inet_pton.h b/lib/inet_pton.h index 43c549143..f991473d6 100644 --- a/lib/curl_inet_pton.h +++ b/lib/inet_pton.h @@ -22,7 +22,7 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" int Curl_inet_pton(int, const char *, void *); diff --git a/lib/curl_krb4.c b/lib/krb4.c index 8ba326ed7..58354b602 100644 --- a/lib/curl_krb4.c +++ b/lib/krb4.c @@ -39,7 +39,7 @@ * */ -#include "curl_setup.h" +#include "setup.h" #ifndef CURL_DISABLE_FTP #ifdef HAVE_KRB4 @@ -50,16 +50,16 @@ #include <krb.h> #include <des.h> -#include "curl_urldata.h" +#include "urldata.h" #include "curl_base64.h" -#include "curl_ftp.h" -#include "curl_sendf.h" -#include "curl_krb4.h" -#include "curl_inet_ntop.h" +#include "ftp.h" +#include "sendf.h" +#include "krb4.h" +#include "inet_ntop.h" #include "curl_memory.h" /* The last #include file should be: */ -#include "curl_memdebug.h" +#include "memdebug.h" #define LOCAL_ADDR (&conn->local_addr) #define REMOTE_ADDR conn->ip_addr->ai_addr diff --git a/lib/curl_krb4.h b/lib/krb4.h index 3e29b2588..3e29b2588 100644 --- a/lib/curl_krb4.h +++ b/lib/krb4.h diff --git a/lib/curl_krb5.c b/lib/krb5.c index d793fef02..c51041dda 100644 --- a/lib/curl_krb5.c +++ b/lib/krb5.c @@ -1,8 +1,8 @@ -/* GSSAPI/krb5 support for FTP - loosely based on old curl_krb4.c +/* GSSAPI/krb5 support for FTP - loosely based on old krb4.c * * Copyright (c) 1995, 1996, 1997, 1998, 1999 Kungliga Tekniska Högskolan * (Royal Institute of Technology, Stockholm, Sweden). - * Copyright (c) 2004 - 2013 Daniel Stenberg + * Copyright (c) 2004 - 2012 Daniel Stenberg * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ -#include "curl_setup.h" +#include "setup.h" #ifndef CURL_DISABLE_FTP #ifdef HAVE_GSSAPI @@ -46,20 +46,20 @@ #include <netdb.h> #endif -#include "curl_urldata.h" +#include "urldata.h" #include "curl_base64.h" -#include "curl_ftp.h" +#include "ftp.h" #include "curl_gssapi.h" -#include "curl_sendf.h" -#include "curl_krb4.h" +#include "sendf.h" +#include "krb4.h" #include "curl_memory.h" -#include "curl_warnless.h" +#include "warnless.h" #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> /* The last #include file should be: */ -#include "curl_memdebug.h" +#include "memdebug.h" #define LOCAL_ADDR (&conn->local_addr) #define REMOTE_ADDR conn->ip_addr->ai_addr diff --git a/lib/curl_ldap.c b/lib/ldap.c index 59f3b832e..9ef31008c 100644 --- a/lib/curl_ldap.c +++ b/lib/ldap.c @@ -1,11 +1,11 @@ /*************************************************************************** - * _ _ ____ _ - * Project ___| | | | _ \| | - * / __| | | | |_) | | - * | (__| |_| | _ <| |___ - * \___|\___/|_| \_\_____| + * _ _ ____ _ + * Project ___| | | | _ \| | + * / __| | | | |_) | | + * | (__| |_| | _ <| |___ + * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2012, 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 @@ -20,15 +20,15 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #if !defined(CURL_DISABLE_LDAP) && !defined(USE_OPENLDAP) /* * 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 curl_openldap.c, otherwise the code that - * gets compiled is the code from curl_ldap.c. + * gets compiled is the code from openldap.c, otherwise the code that gets + * compiled is the code from 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 @@ -54,23 +54,23 @@ # endif /* HAVE_LDAP_SSL && HAVE_LDAP_SSL_H */ #endif -#include "curl_urldata.h" +#include "urldata.h" #include <curl/curl.h> -#include "curl_sendf.h" -#include "curl_escape.h" -#include "curl_progress.h" -#include "curl_transfer.h" -#include "curl_strequal.h" -#include "curl_strtok.h" +#include "sendf.h" +#include "escape.h" +#include "progress.h" +#include "transfer.h" +#include "strequal.h" +#include "strtok.h" #include "curl_ldap.h" #include "curl_memory.h" #include "curl_base64.h" -#include "curl_rawstr.h" +#include "rawstr.h" #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> -#include "curl_memdebug.h" +#include "memdebug.h" #ifndef HAVE_LDAP_URL_PARSE diff --git a/lib/curl_llist.c b/lib/llist.c index 46a8d9960..a302e32d5 100644 --- a/lib/curl_llist.c +++ b/lib/llist.c @@ -20,13 +20,13 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" -#include "curl_llist.h" +#include "llist.h" #include "curl_memory.h" /* this must be the last include file */ -#include "curl_memdebug.h" +#include "memdebug.h" /* * @unittest: 1300 diff --git a/lib/curl_llist.h b/lib/llist.h index 27ddb719a..b4ca82a44 100644 --- a/lib/curl_llist.h +++ b/lib/llist.h @@ -22,7 +22,7 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #include <stddef.h> typedef void (*curl_llist_dtor)(void *, void *); diff --git a/lib/curl_md4.c b/lib/md4.c index d64b472ea..cf6c36023 100644 --- a/lib/curl_md4.c +++ b/lib/md4.c @@ -20,14 +20,14 @@ documentation and/or software. */ -#include "curl_setup.h" +#include "setup.h" /* NSS crypto library does not provide the MD4 hash algorithm, so that we have * a local implementation of it */ #ifdef USE_NSS #include "curl_md4.h" -#include "curl_warnless.h" +#include "warnless.h" typedef unsigned int UINT4; diff --git a/lib/curl_md5.c b/lib/md5.c index 74f53f61b..ae5812b95 100644 --- a/lib/curl_md5.c +++ b/lib/md5.c @@ -20,13 +20,13 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #ifndef CURL_DISABLE_CRYPTO_AUTH #include "curl_md5.h" #include "curl_hmac.h" -#include "curl_warnless.h" +#include "warnless.h" #include "curl_memory.h" @@ -34,7 +34,7 @@ #include <nettle/md5.h> /* The last #include file should be: */ -#include "curl_memdebug.h" +#include "memdebug.h" typedef struct md5_ctx MD5_CTX; @@ -59,7 +59,7 @@ static void MD5_Final(unsigned char digest[16], MD5_CTX * ctx) #include <gcrypt.h> /* The last #include file should be: */ -#include "curl_memdebug.h" +#include "memdebug.h" typedef gcry_md_hd_t MD5_CTX; @@ -443,7 +443,7 @@ static void Decode (UINT4 *output, #endif /* CRYPTO LIBS */ /* The last #include file should be: */ -#include "curl_memdebug.h" +#include "memdebug.h" const HMAC_params Curl_HMAC_MD5[] = { { diff --git a/lib/curl_memdebug.c b/lib/memdebug.c index e756126b2..c95f41fc5 100644 --- a/lib/curl_memdebug.c +++ b/lib/memdebug.c @@ -20,7 +20,7 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #ifdef CURLDEBUG @@ -28,11 +28,11 @@ #define _MPRINTF_REPLACE #include <curl/mprintf.h> -#include "curl_urldata.h" +#include "urldata.h" #define MEMDEBUG_NODEFINES /* don't redefine the standard functions */ #include "curl_memory.h" -#include "curl_memdebug.h" +#include "memdebug.h" #ifndef HAVE_ASSERT_H # define assert(x) Curl_nop_stmt diff --git a/lib/curl_memdebug.h b/lib/memdebug.h index fbeb61de5..1716e3598 100644 --- a/lib/curl_memdebug.h +++ b/lib/memdebug.h @@ -28,7 +28,7 @@ * as well as the library. Do not mix with library internals! */ -#include "curl_setup.h" +#include "setup.h" #include <curl/curl.h> diff --git a/lib/curl_mprintf.c b/lib/mprintf.c index 35b9f644f..0990f4024 100644 --- a/lib/curl_mprintf.c +++ b/lib/mprintf.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1999 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1999 - 2011, 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 @@ -35,7 +35,7 @@ * page at http://daniel.haxx.se/trio/ */ -#include "curl_setup.h" +#include "setup.h" #if defined(DJGPP) && (DJGPP_MINOR < 4) #undef _MPRINTF_REPLACE /* don't use x_was_used() here */ @@ -45,7 +45,7 @@ #include "curl_memory.h" /* The last #include file should be: */ -#include "curl_memdebug.h" +#include "memdebug.h" #ifndef SIZEOF_LONG_DOUBLE #define SIZEOF_LONG_DOUBLE 0 @@ -73,7 +73,7 @@ #endif /* - * Max integer data types that curl_mprintf.c is capable + * Max integer data types that mprintf.c is capable */ #ifdef HAVE_LONG_LONG_TYPE diff --git a/lib/curl_multi.c b/lib/multi.c index 9553883cb..dae1f6b56 100644 --- a/lib/curl_multi.c +++ b/lib/multi.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2012, 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 @@ -20,32 +20,32 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #include <curl/curl.h> -#include "curl_urldata.h" -#include "curl_transfer.h" -#include "curl_url.h" -#include "curl_connect.h" -#include "curl_progress.h" -#include "curl_easyif.h" -#include "curl_multiif.h" -#include "curl_sendf.h" -#include "curl_timeval.h" -#include "curl_http.h" -#include "curl_select.h" -#include "curl_warnless.h" -#include "curl_speedcheck.h" -#include "curl_conncache.h" -#include "curl_bundles.h" +#include "urldata.h" +#include "transfer.h" +#include "url.h" +#include "connect.h" +#include "progress.h" +#include "easyif.h" +#include "multiif.h" +#include "sendf.h" +#include "timeval.h" +#include "http.h" +#include "select.h" +#include "warnless.h" +#include "speedcheck.h" +#include "conncache.h" +#include "bundles.h" #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> #include "curl_memory.h" /* The last #include file should be: */ -#include "curl_memdebug.h" +#include "memdebug.h" /* CURL_SOCKET_HASH_TABLE_SIZE should be a prime number. Increasing it from 97 @@ -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 curl_hash.c + * Enable the hash print function first by editing hash.c */ static void debug_print_sock_hash(void *p) { diff --git a/lib/curl_multiif.h b/lib/multiif.h index 6e5881e2d..c84b6184c 100644 --- a/lib/curl_multiif.h +++ b/lib/multiif.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2010, 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 curl_multi.c + * Prototypes for library-wide functions provided by multi.c */ void Curl_expire(struct SessionHandle *data, long milli); diff --git a/lib/curl_netrc.c b/lib/netrc.c index 10853d395..162a86caa 100644 --- a/lib/curl_netrc.c +++ b/lib/netrc.c @@ -20,7 +20,7 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #ifdef HAVE_PWD_H #include <pwd.h> @@ -30,18 +30,18 @@ #endif #include <curl/curl.h> -#include "curl_netrc.h" +#include "netrc.h" -#include "curl_strequal.h" -#include "curl_strtok.h" +#include "strequal.h" +#include "strtok.h" #include "curl_memory.h" -#include "curl_rawstr.h" +#include "rawstr.h" #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> /* The last #include file should be: */ -#include "curl_memdebug.h" +#include "memdebug.h" /* Get user and password from .netrc when given a machine name */ diff --git a/lib/curl_netrc.h b/lib/netrc.h index 4db764df2..4db764df2 100644 --- a/lib/curl_netrc.h +++ b/lib/netrc.h diff --git a/lib/curl_non_ascii.c b/lib/non-ascii.c index 68b33a92a..8e29227c0 100644 --- a/lib/curl_non_ascii.c +++ b/lib/non-ascii.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2012, 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 @@ -20,20 +20,20 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #ifdef CURL_DOES_CONVERSIONS #include <curl/curl.h> -#include "curl_non_ascii.h" -#include "curl_formdata.h" -#include "curl_sendf.h" -#include "curl_urldata.h" +#include "non-ascii.h" +#include "formdata.h" +#include "sendf.h" +#include "urldata.h" #include "curl_memory.h" /* The last #include file should be: */ -#include "curl_memdebug.h" +#include "memdebug.h" #ifdef HAVE_ICONV #include <iconv.h> @@ -314,8 +314,8 @@ void Curl_convert_close(struct SessionHandle *data) } /* - * 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. + * 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. */ CURLcode Curl_convert_form(struct SessionHandle *data, struct FormData *form) { diff --git a/lib/curl_non_ascii.h b/lib/non-ascii.h index 552a51311..6dcbe0044 100644 --- a/lib/curl_non_ascii.h +++ b/lib/non-ascii.h @@ -21,11 +21,11 @@ * KIND, either express or implied. * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #ifdef CURL_DOES_CONVERSIONS -#include "curl_urldata.h" +#include "urldata.h" /* * Curl_convert_clone() returns a malloced copy of the source string (if diff --git a/lib/curl_nonblock.c b/lib/nonblock.c index 6e6d1287f..a2722ed7f 100644 --- a/lib/curl_nonblock.c +++ b/lib/nonblock.c @@ -20,7 +20,7 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #ifdef HAVE_SYS_IOCTL_H #include <sys/ioctl.h> @@ -37,7 +37,7 @@ #include <inet.h> #endif -#include "curl_nonblock.h" +#include "nonblock.h" /* * curlx_nonblock() set the given socket to either blocking or non-blocking diff --git a/lib/curl_nonblock.h b/lib/nonblock.h index b540ae46f..b540ae46f 100644 --- a/lib/curl_nonblock.h +++ b/lib/nonblock.h diff --git a/lib/curl_nss.c b/lib/nss.c index 15e92a722..86ce6a6d5 100644 --- a/lib/curl_nss.c +++ b/lib/nss.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2012, 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,27 +22,27 @@ /* * Source file for all NSS-specific code for the TLS/SSL layer. No code - * but curl_sslgen.c should ever call or use these functions. + * but sslgen.c should ever call or use these functions. */ -#include "curl_setup.h" +#include "setup.h" #ifdef USE_NSS -#include "curl_urldata.h" -#include "curl_sendf.h" -#include "curl_formdata.h" /* for the boundary function */ -#include "curl_url.h" /* for the ssl config check function */ -#include "curl_connect.h" -#include "curl_strequal.h" -#include "curl_select.h" -#include "curl_sslgen.h" -#include "curl_llist.h" +#include "urldata.h" +#include "sendf.h" +#include "formdata.h" /* for the boundary function */ +#include "url.h" /* for the ssl config check function */ +#include "connect.h" +#include "strequal.h" +#include "select.h" +#include "sslgen.h" +#include "llist.h" #define _MPRINTF_REPLACE /* use the internal *printf() functions */ #include <curl/mprintf.h> -#include "curl_nssg.h" +#include "nssg.h" #include <nspr.h> #include <nss.h> #include <ssl.h> @@ -61,11 +61,11 @@ #include <prerror.h> #include "curl_memory.h" -#include "curl_rawstr.h" -#include "curl_warnless.h" +#include "rawstr.h" +#include "warnless.h" /* The last #include file should be: */ -#include "curl_memdebug.h" +#include "memdebug.h" #define SSL_DIR "/etc/pki/nssdb" diff --git a/lib/curl_nssg.h b/lib/nssg.h index 3ba75d351..647b7bb28 100644 --- a/lib/curl_nssg.h +++ b/lib/nssg.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2012, 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 @@ -21,15 +21,14 @@ * KIND, either express or implied. * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #ifdef USE_NSS /* - * This header should only be needed to get included by curl_sslgen.c and - * curl_nss.c + * This header should only be needed to get included by sslgen.c and nss.c */ -#include "curl_urldata.h" +#include "urldata.h" CURLcode Curl_nss_connect(struct connectdata *conn, int sockindex); CURLcode Curl_nss_connect_nonblocking(struct connectdata *conn, diff --git a/lib/curl_nwlib.c b/lib/nwlib.c index f63f16b83..c67342a08 100644 --- a/lib/curl_nwlib.c +++ b/lib/nwlib.c @@ -20,7 +20,7 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #ifdef NETWARE /* Novell NetWare */ @@ -34,7 +34,7 @@ #include "curl_memory.h" /* The last #include file should be: */ -#include "curl_memdebug.h" +#include "memdebug.h" typedef struct { diff --git a/lib/curl_nwos.c b/lib/nwos.c index 23ff2a717..dd3291155 100644 --- a/lib/curl_nwos.c +++ b/lib/nwos.c @@ -20,7 +20,7 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #ifdef NETWARE /* Novell NetWare */ diff --git a/lib/curl_openldap.c b/lib/openldap.c index b10d31e18..9ccfa7fae 100644 --- a/lib/curl_openldap.c +++ b/lib/openldap.c @@ -1,12 +1,12 @@ /*************************************************************************** - * _ _ ____ _ - * Project ___| | | | _ \| | - * / __| | | | |_) | | - * | (__| |_| | _ <| |___ - * \___|\___/|_| \_\_____| + * _ _ ____ _ + * Project ___| | | | _ \| | + * / __| | | | |_) | | + * | (__| |_| | _ <| |___ + * \___|\___/|_| \_\_____| * * Copyright (C) 2010, Howard Chu, <hyc@openldap.org> - * Copyright (C) 2011 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 2011 - 2012, 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 @@ -21,15 +21,15 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #if !defined(CURL_DISABLE_LDAP) && defined(USE_OPENLDAP) /* * 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 curl_openldap.c, otherwise the code that - * gets compiled is the code from curl_ldap.c. + * gets compiled is the code from openldap.c, otherwise the code that gets + * compiled is the code from 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 @@ -38,11 +38,11 @@ #include <ldap.h> -#include "curl_urldata.h" +#include "urldata.h" #include <curl/curl.h> -#include "curl_sendf.h" -#include "curl_sslgen.h" -#include "curl_transfer.h" +#include "sendf.h" +#include "sslgen.h" +#include "transfer.h" #include "curl_ldap.h" #include "curl_memory.h" #include "curl_base64.h" @@ -50,7 +50,7 @@ #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> -#include "curl_memdebug.h" +#include "memdebug.h" #ifndef _LDAP_PVT_H extern int ldap_pvt_url_scheme2proto(const char *); diff --git a/lib/curl_parsedate.c b/lib/parsedate.c index a50b6074e..b6079bc8f 100644 --- a/lib/curl_parsedate.c +++ b/lib/parsedate.c @@ -73,16 +73,16 @@ */ -#include "curl_setup.h" +#include "setup.h" #ifdef HAVE_LIMITS_H #include <limits.h> #endif #include <curl/curl.h> -#include "curl_rawstr.h" -#include "curl_warnless.h" -#include "curl_parsedate.h" +#include "rawstr.h" +#include "warnless.h" +#include "parsedate.h" const char * const Curl_wkday[] = {"Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"}; diff --git a/lib/curl_parsedate.h b/lib/parsedate.h index ade0f4f60..ade0f4f60 100644 --- a/lib/curl_parsedate.h +++ b/lib/parsedate.h diff --git a/lib/curl_pingpong.c b/lib/pingpong.c index d28e78aa2..85a7a45af 100644 --- a/lib/curl_pingpong.c +++ b/lib/pingpong.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2012, 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,23 +23,23 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" -#include "curl_urldata.h" -#include "curl_sendf.h" -#include "curl_select.h" -#include "curl_progress.h" -#include "curl_speedcheck.h" -#include "curl_pingpong.h" -#include "curl_multiif.h" -#include "curl_non_ascii.h" +#include "urldata.h" +#include "sendf.h" +#include "select.h" +#include "progress.h" +#include "speedcheck.h" +#include "pingpong.h" +#include "multiif.h" +#include "non-ascii.h" #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> #include "curl_memory.h" /* The last #include file should be: */ -#include "curl_memdebug.h" +#include "memdebug.h" #ifdef USE_PINGPONG diff --git a/lib/curl_pingpong.h b/lib/pingpong.h index 77060786a..1d104cfbc 100644 --- a/lib/curl_pingpong.h +++ b/lib/pingpong.h @@ -22,14 +22,14 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #if !defined(CURL_DISABLE_IMAP) || !defined(CURL_DISABLE_FTP) || \ !defined(CURL_DISABLE_POP3) || !defined(CURL_DISABLE_SMTP) #define USE_PINGPONG #endif -/* forward-declaration, this is defined in curl_urldata.h */ +/* forward-declaration, this is defined in urldata.h */ struct connectdata; /* diff --git a/lib/curl_polarssl.c b/lib/polarssl.c index 81c70264f..ef074be13 100644 --- a/lib/curl_polarssl.c +++ b/lib/polarssl.c @@ -6,7 +6,7 @@ * \___|\___/|_| \_\_____| * * Copyright (C) 2010, 2011, Hoi-Ho Chan, <hoiho.chan@gmail.com> - * Copyright (C) 2012 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 2012, 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,11 +23,11 @@ /* * Source file for all PolarSSL-specific code for the TLS/SSL layer. No code - * but curl_sslgen.c should ever call or use these functions. + * but sslgen.c should ever call or use these functions. * */ -#include "curl_setup.h" +#include "setup.h" #ifdef USE_POLARSSL @@ -49,21 +49,21 @@ #define POLARSSL_ERR_NET_WANT_WRITE POLARSSL_ERR_NET_TRY_AGAIN #endif -#include "curl_urldata.h" -#include "curl_sendf.h" -#include "curl_inet_pton.h" -#include "curl_polarssl.h" -#include "curl_sslgen.h" -#include "curl_parsedate.h" -#include "curl_connect.h" /* for the connect timeout */ -#include "curl_select.h" -#include "curl_rawstr.h" +#include "urldata.h" +#include "sendf.h" +#include "inet_pton.h" +#include "polarssl.h" +#include "sslgen.h" +#include "parsedate.h" +#include "connect.h" /* for the connect timeout */ +#include "select.h" +#include "rawstr.h" #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> #include "curl_memory.h" /* The last #include file should be: */ -#include "curl_memdebug.h" +#include "memdebug.h" /* version dependent differences */ #if POLARSSL_VERSION_NUMBER < 0x01010000 diff --git a/lib/curl_polarssl.h b/lib/polarssl.h index 12b3db28c..ad655465e 100644 --- a/lib/curl_polarssl.h +++ b/lib/polarssl.h @@ -21,7 +21,7 @@ * KIND, either express or implied. * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #ifdef USE_POLARSSL diff --git a/lib/curl_pop3.c b/lib/pop3.c index 0d157f00b..08c0de57e 100644 --- a/lib/curl_pop3.c +++ b/lib/pop3.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2012, 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 @@ -29,7 +29,7 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #ifndef CURL_DISABLE_POP3 @@ -56,36 +56,36 @@ #endif #include <curl/curl.h> -#include "curl_urldata.h" -#include "curl_sendf.h" -#include "curl_if2ip.h" -#include "curl_hostip.h" -#include "curl_progress.h" -#include "curl_transfer.h" -#include "curl_escape.h" -#include "curl_http.h" /* for HTTP proxy tunnel stuff */ -#include "curl_socks.h" -#include "curl_pop3.h" - -#include "curl_strtoofft.h" -#include "curl_strequal.h" -#include "curl_sslgen.h" -#include "curl_connect.h" -#include "curl_strerror.h" -#include "curl_select.h" -#include "curl_multiif.h" -#include "curl_url.h" -#include "curl_rawstr.h" +#include "urldata.h" +#include "sendf.h" +#include "if2ip.h" +#include "hostip.h" +#include "progress.h" +#include "transfer.h" +#include "escape.h" +#include "http.h" /* for HTTP proxy tunnel stuff */ +#include "socks.h" +#include "pop3.h" + +#include "strtoofft.h" +#include "strequal.h" +#include "sslgen.h" +#include "connect.h" +#include "strerror.h" +#include "select.h" +#include "multiif.h" +#include "url.h" +#include "rawstr.h" #include "curl_sasl.h" #include "curl_md5.h" -#include "curl_warnless.h" +#include "warnless.h" #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> #include "curl_memory.h" /* The last #include file should be: */ -#include "curl_memdebug.h" +#include "memdebug.h" /* Local API functions */ static CURLcode pop3_parse_url_path(struct connectdata *conn); @@ -1207,7 +1207,7 @@ static CURLcode pop3_statemach_act(struct connectdata *conn) return result; } -/* Called repeatedly until done from curl_multi.c */ +/* Called repeatedly until done from 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 curl_multi.c while DOing */ +/* Called from 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/curl_pop3.h b/lib/pop3.h index 62b88fdac..1b6859955 100644 --- a/lib/curl_pop3.h +++ b/lib/pop3.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 2009 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 2009 - 2012, 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 curl_pop3.c:state() to change state */ + pop3state state; /* Always use pop3.c:state() to change state! */ }; extern const struct Curl_handler Curl_handler_pop3; diff --git a/lib/curl_progress.c b/lib/progress.c index 88f802d0a..e73f01811 100644 --- a/lib/curl_progress.c +++ b/lib/progress.c @@ -20,11 +20,11 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" -#include "curl_urldata.h" -#include "curl_sendf.h" -#include "curl_progress.h" +#include "urldata.h" +#include "sendf.h" +#include "progress.h" #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> diff --git a/lib/curl_progress.h b/lib/progress.h index e68f80416..f97fef996 100644 --- a/lib/curl_progress.h +++ b/lib/progress.h @@ -22,7 +22,7 @@ * ***************************************************************************/ -#include "curl_timeval.h" +#include "timeval.h" typedef enum { diff --git a/lib/curl_qssl.c b/lib/qssl.c index d140dc9eb..172df3141 100644 --- a/lib/curl_qssl.c +++ b/lib/qssl.c @@ -20,7 +20,7 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #ifdef USE_QSOSSL @@ -31,15 +31,15 @@ #endif #include <curl/curl.h> -#include "curl_urldata.h" -#include "curl_sendf.h" -#include "curl_qssl.h" -#include "curl_sslgen.h" -#include "curl_connect.h" /* for the connect timeout */ -#include "curl_select.h" +#include "urldata.h" +#include "sendf.h" +#include "qssl.h" +#include "sslgen.h" +#include "connect.h" /* for the connect timeout */ +#include "select.h" #include "curl_memory.h" /* The last #include file should be: */ -#include "curl_memdebug.h" +#include "memdebug.h" int Curl_qsossl_init(void) diff --git a/lib/curl_qssl.h b/lib/qssl.h index 3a7cc5045..a523cb1f3 100644 --- a/lib/curl_qssl.h +++ b/lib/qssl.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2011, 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 @@ -21,14 +21,13 @@ * KIND, either express or implied. * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" /* - * This header should only be needed to get included by curl_sslgen.c and - * curl_qssl.c + * This header should only be needed to get included by sslgen.c and qssl.c */ -#include "curl_urldata.h" +#include "urldata.h" #ifdef USE_QSOSSL int Curl_qsossl_init(void); diff --git a/lib/curl_rawstr.c b/lib/rawstr.c index 17fd1f3f5..2cf2fe7cb 100644 --- a/lib/curl_rawstr.c +++ b/lib/rawstr.c @@ -20,9 +20,9 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" -#include "curl_rawstr.h" +#include "rawstr.h" /* Portable, consistent toupper (remember EBCDIC). Do not use toupper() because its behavior is altered by the current locale. */ diff --git a/lib/curl_rawstr.h b/lib/rawstr.h index b491460d0..b491460d0 100644 --- a/lib/curl_rawstr.h +++ b/lib/rawstr.h diff --git a/lib/curl_rtsp.c b/lib/rtsp.c index 71e434c47..ca9788ef7 100644 --- a/lib/curl_rtsp.c +++ b/lib/rtsp.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2012, 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 @@ -20,29 +20,29 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #ifndef CURL_DISABLE_RTSP -#include "curl_urldata.h" +#include "urldata.h" #include <curl/curl.h> -#include "curl_transfer.h" -#include "curl_sendf.h" -#include "curl_multiif.h" -#include "curl_http.h" -#include "curl_url.h" -#include "curl_progress.h" -#include "curl_rtsp.h" -#include "curl_rawstr.h" +#include "transfer.h" +#include "sendf.h" +#include "multiif.h" +#include "http.h" +#include "url.h" +#include "progress.h" +#include "rtsp.h" +#include "rawstr.h" #include "curl_memory.h" -#include "curl_select.h" -#include "curl_connect.h" +#include "select.h" +#include "connect.h" #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> /* The last #include file should be: */ -#include "curl_memdebug.h" +#include "memdebug.h" /* * TODO (general) @@ -381,10 +381,10 @@ static CURLcode rtsp_do(struct connectdata *conn, bool *done) } } - /* 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. */ + /* 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. */ if(Curl_checkheaders(data, "User-Agent:") && conn->allocptr.uagent) { Curl_safefree(conn->allocptr.uagent); conn->allocptr.uagent = NULL; diff --git a/lib/curl_rtsp.h b/lib/rtsp.h index 3ffa70cc6..3ffa70cc6 100644 --- a/lib/curl_rtsp.h +++ b/lib/rtsp.h diff --git a/lib/curl_security.c b/lib/security.c index b7544ffbd..b70310b89 100644 --- a/lib/curl_security.c +++ b/lib/security.c @@ -41,7 +41,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ -#include "curl_setup.h" +#include "setup.h" #ifndef CURL_DISABLE_FTP #if defined(HAVE_KRB4) || defined(HAVE_GSSAPI) @@ -54,17 +54,17 @@ #include <limits.h> #endif -#include "curl_urldata.h" +#include "urldata.h" #include "curl_base64.h" #include "curl_memory.h" -#include "curl_krb4.h" -#include "curl_ftp.h" -#include "curl_sendf.h" -#include "curl_rawstr.h" -#include "curl_warnless.h" +#include "krb4.h" +#include "ftp.h" +#include "sendf.h" +#include "rawstr.h" +#include "warnless.h" /* The last #include file should be: */ -#include "curl_memdebug.h" +#include "memdebug.h" static const struct { enum protection_level level; diff --git a/lib/curl_select.c b/lib/select.c index d4519d39e..32b6fa55f 100644 --- a/lib/curl_select.c +++ b/lib/select.c @@ -20,7 +20,7 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #ifdef HAVE_SYS_SELECT_H #include <sys/select.h> @@ -41,10 +41,10 @@ #include <curl/curl.h> -#include "curl_urldata.h" -#include "curl_connect.h" -#include "curl_select.h" -#include "curl_warnless.h" +#include "urldata.h" +#include "connect.h" +#include "select.h" +#include "warnless.h" /* Convenience local macros */ diff --git a/lib/curl_select.h b/lib/select.h index 00789bb89..d66873fe9 100644 --- a/lib/curl_select.h +++ b/lib/select.h @@ -22,7 +22,7 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #ifdef HAVE_SYS_POLL_H #include <sys/poll.h> diff --git a/lib/curl_sendf.c b/lib/sendf.c index a1ec50977..b45e43a32 100644 --- a/lib/curl_sendf.c +++ b/lib/sendf.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2012, 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 @@ -20,34 +20,34 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #include <curl/curl.h> -#include "curl_urldata.h" -#include "curl_sendf.h" -#include "curl_connect.h" -#include "curl_sslgen.h" -#include "curl_ssh.h" -#include "curl_multiif.h" -#include "curl_non_ascii.h" +#include "urldata.h" +#include "sendf.h" +#include "connect.h" +#include "sslgen.h" +#include "ssh.h" +#include "multiif.h" +#include "non-ascii.h" #define _MPRINTF_REPLACE /* use the internal *printf() functions */ #include <curl/mprintf.h> /* the krb4 functions only exists for FTP and if krb4 or gssapi is defined */ #if !defined(CURL_DISABLE_FTP) && (defined(HAVE_KRB4) || defined(HAVE_GSSAPI)) -#include "curl_krb4.h" +#include "krb4.h" #else #define Curl_sec_send(a,b,c,d) -1 #define Curl_sec_read(a,b,c,d) -1 #endif #include "curl_memory.h" -#include "curl_strerror.h" +#include "strerror.h" /* The last #include file should be: */ -#include "curl_memdebug.h" +#include "memdebug.h" #ifdef CURL_DO_LINEEND_CONV /* @@ -385,7 +385,7 @@ static CURLcode pausewrite(struct SessionHandle *data, /* Curl_client_write() sends data to the write callback(s) The bit pattern defines to what "streams" to write to. Body and/or header. - The defines are in curl_sendf.h of course. + The defines are in sendf.h of course. If CURL_DO_LINEEND_CONV is enabled, data is converted IN PLACE to the local character encoding. This is a problem and should be changed in diff --git a/lib/curl_sendf.h b/lib/sendf.h index 39489e40f..39911d016 100644 --- a/lib/curl_sendf.h +++ b/lib/sendf.h @@ -22,7 +22,7 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" CURLcode Curl_sendf(curl_socket_t sockfd, struct connectdata *, const char *fmt, ...); diff --git a/lib/curl_setup.h b/lib/setup.h index 37be5ae46..6d2dc90a8 100644 --- a/lib/curl_setup.h +++ b/lib/setup.h @@ -645,7 +645,9 @@ int netware_init(void); * Include macros and defines that should only be processed once. */ -#include "curl_setup_once.h" +#ifndef __SETUP_ONCE_H +#include "setup_once.h" +#endif /* * Definition of our NOP statement Object-like macro diff --git a/lib/curl_setup_once.h b/lib/setup_once.h index 2d55c4060..2d55c4060 100644 --- a/lib/curl_setup_once.h +++ b/lib/setup_once.h diff --git a/lib/curl_share.c b/lib/share.c index 182e6e99b..477c35b0b 100644 --- a/lib/curl_share.c +++ b/lib/share.c @@ -20,16 +20,16 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #include <curl/curl.h> -#include "curl_urldata.h" -#include "curl_share.h" -#include "curl_sslgen.h" +#include "urldata.h" +#include "share.h" +#include "sslgen.h" #include "curl_memory.h" /* The last #include file should be: */ -#include "curl_memdebug.h" +#include "memdebug.h" CURLSH * curl_share_init(void) diff --git a/lib/curl_share.h b/lib/share.h index ecf6f2a79..b9e6c2538 100644 --- a/lib/curl_share.h +++ b/lib/share.h @@ -22,10 +22,10 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #include <curl/curl.h> -#include "curl_cookie.h" -#include "curl_urldata.h" +#include "cookie.h" +#include "urldata.h" /* SalfordC says "A structure member may not be volatile". Hence: */ diff --git a/lib/curl_slist.c b/lib/slist.c index 2a30ea620..4ddebb609 100644 --- a/lib/curl_slist.c +++ b/lib/slist.c @@ -20,13 +20,13 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #include "curl_memory.h" -#include "curl_slist.h" +#include "slist.h" /* The last #include file should be: */ -#include "curl_memdebug.h" +#include "memdebug.h" /* returns last node in linked list */ static struct curl_slist *slist_get_last(struct curl_slist *list) diff --git a/lib/curl_slist.h b/lib/slist.h index aede1f041..aede1f041 100644 --- a/lib/curl_slist.h +++ b/lib/slist.h diff --git a/lib/curl_smtp.c b/lib/smtp.c index 5c4c25c6f..a1840a434 100644 --- a/lib/curl_smtp.c +++ b/lib/smtp.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2012, 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,7 +27,7 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #ifndef CURL_DISABLE_SMTP @@ -54,36 +54,36 @@ #endif #include <curl/curl.h> -#include "curl_urldata.h" -#include "curl_sendf.h" -#include "curl_if2ip.h" -#include "curl_hostip.h" -#include "curl_progress.h" -#include "curl_transfer.h" -#include "curl_escape.h" -#include "curl_http.h" /* for HTTP proxy tunnel stuff */ -#include "curl_socks.h" -#include "curl_smtp.h" - -#include "curl_strtoofft.h" -#include "curl_strequal.h" -#include "curl_sslgen.h" -#include "curl_connect.h" -#include "curl_strerror.h" -#include "curl_select.h" -#include "curl_multiif.h" -#include "curl_url.h" -#include "curl_rawstr.h" +#include "urldata.h" +#include "sendf.h" +#include "if2ip.h" +#include "hostip.h" +#include "progress.h" +#include "transfer.h" +#include "escape.h" +#include "http.h" /* for HTTP proxy tunnel stuff */ +#include "socks.h" +#include "smtp.h" + +#include "strtoofft.h" +#include "strequal.h" +#include "sslgen.h" +#include "connect.h" +#include "strerror.h" +#include "select.h" +#include "multiif.h" +#include "url.h" +#include "rawstr.h" #include "curl_gethostname.h" #include "curl_sasl.h" -#include "curl_warnless.h" +#include "warnless.h" #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> #include "curl_memory.h" /* The last #include file should be: */ -#include "curl_memdebug.h" +#include "memdebug.h" /* Local API functions */ static CURLcode smtp_regular_transfer(struct connectdata *conn, bool *done); @@ -1226,7 +1226,7 @@ static CURLcode smtp_statemach_act(struct connectdata *conn) return result; } -/* Called repeatedly until done from curl_multi.c */ +/* Called repeatedly until done from 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 curl_multi.c while DOing */ +/* Called from 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/curl_smtp.h b/lib/smtp.h index d92547c11..0d605628d 100644 --- a/lib/curl_smtp.h +++ b/lib/smtp.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 2009 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 2009 - 2012, 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 @@ * ***************************************************************************/ -#include "curl_pingpong.h" +#include "pingpong.h" /**************************************************************************** * SMTP unique setup @@ -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 curl_smtp.c:state() to change */ + smtpstate state; /* Always use smtp.c:state() to change state! */ struct curl_slist *rcpt; /* Recipient list */ bool ssldone; /* Is connect() over SSL done? Only relevant in multi mode */ diff --git a/lib/curl_sockaddr.h b/lib/sockaddr.h index 6a2151c9d..522a2199f 100644 --- a/lib/curl_sockaddr.h +++ b/lib/sockaddr.h @@ -22,7 +22,7 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" struct Curl_sockaddr_storage { union { diff --git a/lib/curl_socks.c b/lib/socks.c index 1b70dd629..13a756a40 100644 --- a/lib/curl_socks.c +++ b/lib/socks.c @@ -20,7 +20,7 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #if !defined(CURL_DISABLE_PROXY) @@ -31,16 +31,16 @@ #include <arpa/inet.h> #endif -#include "curl_urldata.h" -#include "curl_sendf.h" -#include "curl_strequal.h" -#include "curl_select.h" -#include "curl_connect.h" -#include "curl_timeval.h" -#include "curl_socks.h" +#include "urldata.h" +#include "sendf.h" +#include "strequal.h" +#include "select.h" +#include "connect.h" +#include "timeval.h" +#include "socks.h" /* The last #include file should be: */ -#include "curl_memdebug.h" +#include "memdebug.h" /* * Helper read-from-socket functions. Does the same as Curl_read() but it diff --git a/lib/curl_socks.h b/lib/socks.h index dc4670b24..0ce0bd044 100644 --- a/lib/curl_socks.h +++ b/lib/socks.h @@ -22,7 +22,7 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #ifdef CURL_DISABLE_PROXY #define Curl_SOCKS4(a,b,c,d,e,f) CURLE_NOT_BUILT_IN diff --git a/lib/curl_socks_gssapi.c b/lib/socks_gssapi.c index 2bd3d4508..02dd485f1 100644 --- a/lib/curl_socks_gssapi.c +++ b/lib/socks_gssapi.c @@ -21,7 +21,7 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #ifndef CURL_DISABLE_PROXY @@ -35,19 +35,19 @@ #endif #include "curl_gssapi.h" -#include "curl_urldata.h" -#include "curl_sendf.h" -#include "curl_connect.h" -#include "curl_timeval.h" -#include "curl_socks.h" -#include "curl_warnless.h" +#include "urldata.h" +#include "sendf.h" +#include "connect.h" +#include "timeval.h" +#include "socks.h" +#include "warnless.h" #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> #include "curl_memory.h" /* The last #include file should be: */ -#include "curl_memdebug.h" +#include "memdebug.h" static gss_ctx_id_t gss_context = GSS_C_NO_CONTEXT; diff --git a/lib/curl_socks_sspi.c b/lib/socks_sspi.c index c57610717..6e95e3c35 100644 --- a/lib/curl_socks_sspi.c +++ b/lib/socks_sspi.c @@ -21,26 +21,26 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #if defined(USE_WINDOWS_SSPI) && !defined(CURL_DISABLE_PROXY) -#include "curl_urldata.h" -#include "curl_sendf.h" -#include "curl_connect.h" -#include "curl_strerror.h" -#include "curl_timeval.h" -#include "curl_socks.h" +#include "urldata.h" +#include "sendf.h" +#include "connect.h" +#include "strerror.h" +#include "timeval.h" +#include "socks.h" #include "curl_sspi.h" #include "curl_multibyte.h" -#include "curl_warnless.h" +#include "warnless.h" #define _MPRINTF_REPLACE /* use the internal *printf() functions */ #include <curl/mprintf.h> #include "curl_memory.h" /* The last #include file should be: */ -#include "curl_memdebug.h" +#include "memdebug.h" /* * Definitions required from ntsecapi.h are directly provided below this point diff --git a/lib/curl_speedcheck.c b/lib/speedcheck.c index b9ce77dbf..ca2323f57 100644 --- a/lib/curl_speedcheck.c +++ b/lib/speedcheck.c @@ -20,13 +20,13 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #include <curl/curl.h> -#include "curl_urldata.h" -#include "curl_sendf.h" -#include "curl_multiif.h" -#include "curl_speedcheck.h" +#include "urldata.h" +#include "sendf.h" +#include "multiif.h" +#include "speedcheck.h" void Curl_speedinit(struct SessionHandle *data) { diff --git a/lib/curl_speedcheck.h b/lib/speedcheck.h index a933781c0..fc40e7d0c 100644 --- a/lib/curl_speedcheck.h +++ b/lib/speedcheck.h @@ -22,9 +22,9 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" -#include "curl_timeval.h" +#include "timeval.h" void Curl_speedinit(struct SessionHandle *data); CURLcode Curl_speedcheck(struct SessionHandle *data, diff --git a/lib/curl_splay.c b/lib/splay.c index 21f1d222e..b6664e6df 100644 --- a/lib/curl_splay.c +++ b/lib/splay.c @@ -20,9 +20,9 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" -#include "curl_splay.h" +#include "splay.h" /* * This macro compares two node keys i and j and returns: diff --git a/lib/curl_splay.h b/lib/splay.h index 5f9ef24cc..49a6dec41 100644 --- a/lib/curl_splay.h +++ b/lib/splay.h @@ -21,7 +21,7 @@ * KIND, either express or implied. * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" struct Curl_tree { struct Curl_tree *smaller; /* smaller node */ diff --git a/lib/curl_ssh.c b/lib/ssh.c index d769a041b..1cc4bcd4c 100644 --- a/lib/curl_ssh.c +++ b/lib/ssh.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2012, 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 @@ /* #define CURL_LIBSSH2_DEBUG */ -#include "curl_setup.h" +#include "setup.h" #ifdef USE_LIBSSH2 @@ -60,36 +60,36 @@ #endif #include <curl/curl.h> -#include "curl_urldata.h" -#include "curl_sendf.h" -#include "curl_hostip.h" -#include "curl_progress.h" -#include "curl_transfer.h" -#include "curl_escape.h" -#include "curl_http.h" /* for HTTP proxy tunnel stuff */ -#include "curl_ssh.h" -#include "curl_url.h" -#include "curl_speedcheck.h" -#include "curl_getinfo.h" - -#include "curl_strequal.h" -#include "curl_sslgen.h" -#include "curl_connect.h" -#include "curl_strerror.h" -#include "curl_inet_ntop.h" -#include "curl_parsedate.h" /* for the week day and month names */ -#include "curl_sockaddr.h" /* required for Curl_sockaddr_storage */ -#include "curl_strtoofft.h" -#include "curl_multiif.h" -#include "curl_select.h" -#include "curl_warnless.h" +#include "urldata.h" +#include "sendf.h" +#include "hostip.h" +#include "progress.h" +#include "transfer.h" +#include "escape.h" +#include "http.h" /* for HTTP proxy tunnel stuff */ +#include "ssh.h" +#include "url.h" +#include "speedcheck.h" +#include "getinfo.h" + +#include "strequal.h" +#include "sslgen.h" +#include "connect.h" +#include "strerror.h" +#include "inet_ntop.h" +#include "parsedate.h" /* for the week day and month names */ +#include "sockaddr.h" /* required for Curl_sockaddr_storage */ +#include "strtoofft.h" +#include "multiif.h" +#include "select.h" +#include "warnless.h" #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> #include "curl_memory.h" /* The last #include file should be: */ -#include "curl_memdebug.h" +#include "memdebug.h" #ifdef WIN32 # undef PATH_MAX @@ -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 curl_multi.c */ +/* called repeatedly until done from 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 curl_multi.c while DOing */ +/* called from 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 curl_multi.c while DOing */ +/* called from 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/curl_ssh.h b/lib/ssh.h index c7f1a9c69..bf43fdf3a 100644 --- a/lib/curl_ssh.h +++ b/lib/ssh.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2011, 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 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #ifdef HAVE_LIBSSH2_H #include <libssh2.h> @@ -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 curl_ssh.c:state() to change */ + sshstate state; /* always use ssh.c:state() to change state! */ 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_sslgen.c b/lib/sslgen.c index d85ba8ae6..67dd71fa6 100644 --- a/lib/curl_sslgen.c +++ b/lib/sslgen.c @@ -43,28 +43,28 @@ http://httpd.apache.org/docs-2.0/ssl/ssl_intro.html */ -#include "curl_setup.h" +#include "setup.h" -#include "curl_urldata.h" +#include "urldata.h" #define SSLGEN_C -#include "curl_sslgen.h" /* generic SSL protos etc */ -#include "curl_ssluse.h" /* OpenSSL versions */ -#include "curl_gtls.h" /* GnuTLS versions */ -#include "curl_nssg.h" /* NSS versions */ -#include "curl_qssl.h" /* QSOSSL versions */ -#include "curl_polarssl.h" /* PolarSSL versions */ -#include "curl_axtls.h" /* axTLS versions */ -#include "curl_cyassl.h" /* CyaSSL versions */ +#include "sslgen.h" /* generic SSL protos etc */ +#include "ssluse.h" /* OpenSSL versions */ +#include "gtls.h" /* GnuTLS versions */ +#include "nssg.h" /* NSS versions */ +#include "qssl.h" /* QSOSSL versions */ +#include "polarssl.h" /* PolarSSL versions */ +#include "axtls.h" /* axTLS versions */ +#include "cyassl.h" /* CyaSSL versions */ #include "curl_schannel.h" /* Schannel SSPI version */ #include "curl_darwinssl.h" /* SecureTransport (Darwin) version */ -#include "curl_sendf.h" -#include "curl_rawstr.h" -#include "curl_url.h" +#include "sendf.h" +#include "rawstr.h" +#include "url.h" #include "curl_memory.h" -#include "curl_progress.h" -#include "curl_share.h" +#include "progress.h" +#include "share.h" /* The last #include file should be: */ -#include "curl_memdebug.h" +#include "memdebug.h" /* convenience macro to check if this handle is using a shared SSL session */ #define SSLSESSION_SHARED(data) (data->share && \ diff --git a/lib/curl_sslgen.h b/lib/sslgen.h index 17ad8e343..2369b552c 100644 --- a/lib/curl_sslgen.h +++ b/lib/sslgen.h @@ -21,7 +21,7 @@ * KIND, either express or implied. * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #ifndef MD5_DIGEST_LENGTH #define MD5_DIGEST_LENGTH 16 /* fixed size */ diff --git a/lib/curl_ssluse.c b/lib/ssluse.c index 0809d4614..8f9fce4c8 100644 --- a/lib/curl_ssluse.c +++ b/lib/ssluse.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2012, 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 curl_sslgen.c should ever call or use these functions. + * but sslgen.c should ever call or use these functions. */ /* @@ -30,24 +30,24 @@ * Sampo Kellomaki 1998. */ -#include "curl_setup.h" +#include "setup.h" #ifdef HAVE_LIMITS_H #include <limits.h> #endif -#include "curl_urldata.h" -#include "curl_sendf.h" -#include "curl_formdata.h" /* for the boundary function */ -#include "curl_url.h" /* for the ssl config check function */ -#include "curl_inet_pton.h" -#include "curl_ssluse.h" -#include "curl_connect.h" -#include "curl_strequal.h" -#include "curl_select.h" -#include "curl_sslgen.h" -#include "curl_rawstr.h" -#include "curl_hostcheck.h" +#include "urldata.h" +#include "sendf.h" +#include "formdata.h" /* for the boundary function */ +#include "url.h" /* for the ssl config check function */ +#include "inet_pton.h" +#include "ssluse.h" +#include "connect.h" +#include "strequal.h" +#include "select.h" +#include "sslgen.h" +#include "rawstr.h" +#include "hostcheck.h" #define _MPRINTF_REPLACE /* use the internal *printf() functions */ #include <curl/mprintf.h> @@ -67,12 +67,12 @@ #include <md5.h> #endif -#include "curl_warnless.h" +#include "warnless.h" #include "curl_memory.h" -#include "curl_non_ascii.h" /* for Curl_convert_from_utf8 prototype */ +#include "non-ascii.h" /* for Curl_convert_from_utf8 prototype */ /* The last #include file should be: */ -#include "curl_memdebug.h" +#include "memdebug.h" #ifndef OPENSSL_VERSION_NUMBER #error "OPENSSL_VERSION_NUMBER not defined" diff --git a/lib/curl_ssluse.h b/lib/ssluse.h index 669be57c1..5375a6a65 100644 --- a/lib/curl_ssluse.h +++ b/lib/ssluse.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2012, 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,15 +22,14 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #ifdef USE_SSLEAY /* - * This header should only be needed to get included by curl_sslgen.c and - * curl_ssluse.c + * This header should only be needed to get included by sslgen.c and ssluse.c */ -#include "curl_urldata.h" +#include "urldata.h" CURLcode Curl_ossl_connect(struct connectdata *conn, int sockindex); CURLcode Curl_ossl_connect_nonblocking(struct connectdata *conn, diff --git a/lib/curl_strdup.c b/lib/strdup.c index 8dcaa67f0..27014354d 100644 --- a/lib/curl_strdup.c +++ b/lib/strdup.c @@ -22,9 +22,9 @@ /* * This file is 'mem-include-scan' clean. See test 1132. */ -#include "curl_setup.h" +#include "setup.h" -#include "curl_strdup.h" +#include "strdup.h" #ifndef HAVE_STRDUP char *curlx_strdup(const char *str) diff --git a/lib/curl_strdup.h b/lib/strdup.h index 49af9117e..4edbcd7d4 100644 --- a/lib/curl_strdup.h +++ b/lib/strdup.h @@ -21,7 +21,7 @@ * KIND, either express or implied. * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #ifndef HAVE_STRDUP extern char *curlx_strdup(const char *str); diff --git a/lib/curl_strequal.c b/lib/strequal.c index 5d370c854..89ad8a6e8 100644 --- a/lib/curl_strequal.c +++ b/lib/strequal.c @@ -20,13 +20,13 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #ifdef HAVE_STRINGS_H #include <strings.h> #endif -#include "curl_strequal.h" +#include "strequal.h" /* * @unittest: 1301 diff --git a/lib/curl_strequal.h b/lib/strequal.h index 287e042f4..287e042f4 100644 --- a/lib/curl_strequal.h +++ b/lib/strequal.h diff --git a/lib/curl_strerror.c b/lib/strerror.c index 27567a1ac..0c82a53e4 100644 --- a/lib/curl_strerror.c +++ b/lib/strerror.c @@ -20,7 +20,7 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #ifdef HAVE_STRERROR_R # if (!defined(HAVE_POSIX_STRERROR_R) && \ @@ -39,14 +39,14 @@ #include <idna.h> #endif -#include "curl_strerror.h" +#include "strerror.h" #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> #include "curl_memory.h" /* The last #include file should be: */ -#include "curl_memdebug.h" +#include "memdebug.h" const char * curl_easy_strerror(CURLcode error) diff --git a/lib/curl_strerror.h b/lib/strerror.h index 60f193f97..f1b22210a 100644 --- a/lib/curl_strerror.h +++ b/lib/strerror.h @@ -22,7 +22,7 @@ * ***************************************************************************/ -#include "curl_urldata.h" +#include "urldata.h" const char *Curl_strerror (struct connectdata *conn, int err); diff --git a/lib/curl_strtok.c b/lib/strtok.c index 33bdd96af..94eac0e64 100644 --- a/lib/curl_strtok.c +++ b/lib/strtok.c @@ -20,12 +20,12 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #ifndef HAVE_STRTOK_R #include <stddef.h> -#include "curl_strtok.h" +#include "strtok.h" char * Curl_strtok_r(char *ptr, const char *sep, char **end) diff --git a/lib/curl_strtok.h b/lib/strtok.h index 1147d70d3..8baf77948 100644 --- a/lib/curl_strtok.h +++ b/lib/strtok.h @@ -21,7 +21,7 @@ * KIND, either express or implied. * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #include <stddef.h> #ifndef HAVE_STRTOK_R diff --git a/lib/curl_strtoofft.c b/lib/strtoofft.c index d203d9cc7..c61459de8 100644 --- a/lib/curl_strtoofft.c +++ b/lib/strtoofft.c @@ -20,9 +20,9 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" -#include "curl_strtoofft.h" +#include "strtoofft.h" /* * NOTE: diff --git a/lib/curl_strtoofft.h b/lib/strtoofft.h index b812a67a0..08b0e6d91 100644 --- a/lib/curl_strtoofft.h +++ b/lib/strtoofft.h @@ -22,7 +22,7 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" /* * Determine which string to integral data type conversion function we use diff --git a/lib/curl_telnet.c b/lib/telnet.c index 54eab1c92..a64da090f 100644 --- a/lib/curl_telnet.c +++ b/lib/telnet.c @@ -20,7 +20,7 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #ifndef CURL_DISABLE_TELNET @@ -44,13 +44,13 @@ #include <sys/param.h> #endif -#include "curl_urldata.h" +#include "urldata.h" #include <curl/curl.h> -#include "curl_transfer.h" -#include "curl_sendf.h" -#include "curl_telnet.h" -#include "curl_connect.h" -#include "curl_progress.h" +#include "transfer.h" +#include "sendf.h" +#include "telnet.h" +#include "connect.h" +#include "progress.h" #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> @@ -58,15 +58,15 @@ #define TELOPTS #define TELCMDS -#include "curl_arpa_telnet.h" +#include "arpa_telnet.h" #include "curl_memory.h" -#include "curl_select.h" -#include "curl_strequal.h" -#include "curl_rawstr.h" -#include "curl_warnless.h" +#include "select.h" +#include "strequal.h" +#include "rawstr.h" +#include "warnless.h" /* The last #include file should be: */ -#include "curl_memdebug.h" +#include "memdebug.h" #define SUBBUFSIZE 512 diff --git a/lib/curl_telnet.h b/lib/telnet.h index ddb9e5473..ddb9e5473 100644 --- a/lib/curl_telnet.h +++ b/lib/telnet.h diff --git a/lib/curl_tftp.c b/lib/tftp.c index 1af246ec0..97276ea99 100644 --- a/lib/curl_tftp.c +++ b/lib/tftp.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2012, 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 @@ -20,7 +20,7 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #ifndef CURL_DISABLE_TFTP @@ -44,27 +44,27 @@ #include <sys/param.h> #endif -#include "curl_urldata.h" +#include "urldata.h" #include <curl/curl.h> -#include "curl_transfer.h" -#include "curl_sendf.h" -#include "curl_tftp.h" -#include "curl_progress.h" -#include "curl_connect.h" -#include "curl_strerror.h" -#include "curl_sockaddr.h" /* required for Curl_sockaddr_storage */ -#include "curl_multiif.h" -#include "curl_url.h" -#include "curl_rawstr.h" +#include "transfer.h" +#include "sendf.h" +#include "tftp.h" +#include "progress.h" +#include "connect.h" +#include "strerror.h" +#include "sockaddr.h" /* required for Curl_sockaddr_storage */ +#include "multiif.h" +#include "url.h" +#include "rawstr.h" #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> #include "curl_memory.h" -#include "curl_select.h" +#include "select.h" /* The last #include file should be: */ -#include "curl_memdebug.h" +#include "memdebug.h" /* RFC2348 allows the block size to be negotiated */ #define TFTP_BLKSIZE_DEFAULT 512 @@ -1371,7 +1371,7 @@ static CURLcode tftp_multi_statemach(struct connectdata *conn, bool *done) * * tftp_doing * - * Called from curl_multi.c while DOing + * Called from multi.c while DOing * **********************************************************/ static CURLcode tftp_doing(struct connectdata *conn, bool *dophase_done) diff --git a/lib/curl_tftp.h b/lib/tftp.h index 117b40f62..117b40f62 100644 --- a/lib/curl_tftp.h +++ b/lib/tftp.h diff --git a/lib/curl_timeval.c b/lib/timeval.c index 8e4c7bd76..2fd720144 100644 --- a/lib/curl_timeval.c +++ b/lib/timeval.c @@ -20,7 +20,7 @@ * ***************************************************************************/ -#include "curl_timeval.h" +#include "timeval.h" #if defined(WIN32) && !defined(MSDOS) diff --git a/lib/curl_timeval.h b/lib/timeval.h index 3f1b9ea70..b464ae406 100644 --- a/lib/curl_timeval.h +++ b/lib/timeval.h @@ -27,7 +27,7 @@ * as well as the library. Do not mix with library internals! */ -#include "curl_setup.h" +#include "setup.h" struct timeval curlx_tvnow(void); diff --git a/lib/curl_transfer.c b/lib/transfer.c index a1dee1dd0..6194908d6 100644 --- a/lib/curl_transfer.c +++ b/lib/transfer.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2012, 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 @@ -20,11 +20,11 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" -#include "curl_strtoofft.h" -#include "curl_strequal.h" -#include "curl_rawstr.h" +#include "strtoofft.h" +#include "strequal.h" +#include "rawstr.h" #ifdef HAVE_NETINET_IN_H #include <netinet/in.h> @@ -57,35 +57,35 @@ #error "We can't compile without socket() support!" #endif -#include "curl_urldata.h" +#include "urldata.h" #include <curl/curl.h> -#include "curl_netrc.h" - -#include "curl_content_encoding.h" -#include "curl_hostip.h" -#include "curl_transfer.h" -#include "curl_sendf.h" -#include "curl_speedcheck.h" -#include "curl_progress.h" -#include "curl_http.h" -#include "curl_url.h" -#include "curl_getinfo.h" -#include "curl_sslgen.h" -#include "curl_http_digest.h" +#include "netrc.h" + +#include "content_encoding.h" +#include "hostip.h" +#include "transfer.h" +#include "sendf.h" +#include "speedcheck.h" +#include "progress.h" +#include "http.h" +#include "url.h" +#include "getinfo.h" +#include "sslgen.h" +#include "http_digest.h" #include "curl_ntlm.h" -#include "curl_http_negotiate.h" -#include "curl_share.h" +#include "http_negotiate.h" +#include "share.h" #include "curl_memory.h" -#include "curl_select.h" -#include "curl_multiif.h" -#include "curl_connect.h" -#include "curl_non_ascii.h" +#include "select.h" +#include "multiif.h" +#include "connect.h" +#include "non-ascii.h" #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> /* The last #include file should be: */ -#include "curl_memdebug.h" +#include "memdebug.h" #define CURL_TIMEOUT_EXPECT_100 1000 /* counting ms here */ @@ -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 curl_http_chunks.c. + in http_chunks.c. Make sure that ALL_CONTENT_ENCODINGS contains all the encodings handled here. */ #ifdef HAVE_LIBZ @@ -1725,7 +1725,7 @@ CURLcode Curl_follow(struct SessionHandle *data, char *newurl, /* this 'newurl' is the Location: string, and it must be malloc()ed before passed here */ - followtype type) /* see curl_transfer.h */ + followtype type) /* see transfer.h */ { #ifdef CURL_DISABLE_HTTP (void)data; diff --git a/lib/curl_transfer.h b/lib/transfer.h index b47422a63..b47422a63 100644 --- a/lib/curl_transfer.h +++ b/lib/transfer.h diff --git a/lib/curl_url.c b/lib/url.c index 52badc5d7..58befecab 100644 --- a/lib/curl_url.c +++ b/lib/url.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2012, 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 @@ -20,7 +20,7 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #ifdef HAVE_NETINET_IN_H #include <netinet/in.h> @@ -74,61 +74,61 @@ void idn_free (void *ptr); int curl_win32_idn_to_ascii(const char *in, char **out); #endif /* USE_LIBIDN */ -#include "curl_urldata.h" -#include "curl_netrc.h" - -#include "curl_formdata.h" -#include "curl_sslgen.h" -#include "curl_hostip.h" -#include "curl_transfer.h" -#include "curl_sendf.h" -#include "curl_progress.h" -#include "curl_cookie.h" -#include "curl_strequal.h" -#include "curl_strerror.h" -#include "curl_escape.h" -#include "curl_strtok.h" -#include "curl_share.h" -#include "curl_content_encoding.h" -#include "curl_http_digest.h" -#include "curl_http_negotiate.h" -#include "curl_select.h" -#include "curl_multiif.h" -#include "curl_easyif.h" -#include "curl_speedcheck.h" -#include "curl_rawstr.h" -#include "curl_warnless.h" -#include "curl_non_ascii.h" -#include "curl_inet_pton.h" +#include "urldata.h" +#include "netrc.h" + +#include "formdata.h" +#include "sslgen.h" +#include "hostip.h" +#include "transfer.h" +#include "sendf.h" +#include "progress.h" +#include "cookie.h" +#include "strequal.h" +#include "strerror.h" +#include "escape.h" +#include "strtok.h" +#include "share.h" +#include "content_encoding.h" +#include "http_digest.h" +#include "http_negotiate.h" +#include "select.h" +#include "multiif.h" +#include "easyif.h" +#include "speedcheck.h" +#include "rawstr.h" +#include "warnless.h" +#include "non-ascii.h" +#include "inet_pton.h" /* And now for the protocols */ -#include "curl_ftp.h" -#include "curl_dict.h" -#include "curl_telnet.h" -#include "curl_tftp.h" -#include "curl_http.h" -#include "curl_file.h" +#include "ftp.h" +#include "dict.h" +#include "telnet.h" +#include "tftp.h" +#include "http.h" +#include "file.h" #include "curl_ldap.h" -#include "curl_ssh.h" -#include "curl_imap.h" -#include "curl_url.h" -#include "curl_connect.h" -#include "curl_inet_ntop.h" +#include "ssh.h" +#include "imap.h" +#include "url.h" +#include "connect.h" +#include "inet_ntop.h" #include "curl_ntlm.h" #include "curl_ntlm_wb.h" -#include "curl_socks.h" +#include "socks.h" #include "curl_rtmp.h" -#include "curl_gopher.h" -#include "curl_http_proxy.h" -#include "curl_bundles.h" -#include "curl_conncache.h" +#include "gopher.h" +#include "http_proxy.h" +#include "bundles.h" +#include "conncache.h" #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> #include "curl_memory.h" /* The last #include file should be: */ -#include "curl_memdebug.h" +#include "memdebug.h" /* Local static prototypes */ static bool ConnectionKillOne(struct SessionHandle *data); @@ -508,7 +508,7 @@ CURLcode Curl_init_userdefined(struct UserDefined *set) /* Set the default size of the SSL session ID cache */ set->ssl.max_ssl_sessions = 5; - set->proxyport = CURL_DEFAULT_PROXY_PORT; /* from curl_url.h */ + set->proxyport = CURL_DEFAULT_PROXY_PORT; /* from url.h */ set->proxytype = CURLPROXY_HTTP; /* defaults to HTTP proxy */ set->httpauth = CURLAUTH_BASIC; /* defaults to basic */ set->proxyauth = CURLAUTH_BASIC; /* defaults to basic */ @@ -2190,7 +2190,7 @@ CURLcode Curl_setopt(struct SessionHandle *data, CURLoption option, break; case CURLOPT_SSH_KEYFUNCTION: - /* setting to NULL is fine since the curl_ssh.c functions themselves will + /* setting to NULL is fine since the 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/curl_version.c too! */ + * lib/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 curl_transfer.c, but we better do it here */ + /* This was formerly done in 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 diff --git a/lib/curl_url.h b/lib/url.h index cc113abdc..ab6d3d048 100644 --- a/lib/curl_url.h +++ b/lib/url.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2011, 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 @@ -21,10 +21,10 @@ * KIND, either express or implied. * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" /* - * Prototypes for library-wide functions provided by curl_url.c + * Prototypes for library-wide functions provided by url.c */ CURLcode Curl_open(struct SessionHandle **curl); diff --git a/lib/curl_urldata.h b/lib/urldata.h index d9edee079..cd50f623f 100644 --- a/lib/curl_urldata.h +++ b/lib/urldata.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2012, 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 @@ /* This file is for lib internal stuff */ -#include "curl_setup.h" +#include "setup.h" #define PORT_FTP 21 #define PORT_FTPS 990 @@ -66,8 +66,8 @@ */ #define RESP_TIMEOUT (1800*1000) -#include "curl_cookie.h" -#include "curl_formdata.h" +#include "cookie.h" +#include "formdata.h" #ifdef USE_SSLEAY #ifdef USE_OPENSSL @@ -150,7 +150,7 @@ #include <netinet/in.h> #endif -#include "curl_timeval.h" +#include "timeval.h" #ifdef HAVE_ZLIB_H #include <zlib.h> /* for content-encoding */ @@ -162,20 +162,20 @@ #include <curl/curl.h> -#include "curl_http_chunks.h" /* for the structs and enum stuff */ -#include "curl_hostip.h" -#include "curl_hash.h" -#include "curl_splay.h" - -#include "curl_imap.h" -#include "curl_pop3.h" -#include "curl_smtp.h" -#include "curl_ftp.h" -#include "curl_file.h" -#include "curl_ssh.h" -#include "curl_http.h" -#include "curl_rtsp.h" -#include "curl_wildcard.h" +#include "http_chunks.h" /* for the structs and enum stuff */ +#include "hostip.h" +#include "hash.h" +#include "splay.h" + +#include "imap.h" +#include "pop3.h" +#include "smtp.h" +#include "ftp.h" +#include "file.h" +#include "ssh.h" +#include "http.h" +#include "rtsp.h" +#include "wildcard.h" #ifdef HAVE_GSSAPI # ifdef HAVE_GSSGNU @@ -664,7 +664,7 @@ struct SingleRequest { bool forbidchunk; /* used only to explicitly forbid chunk-upload for specific upload buffers. See readmoredata() in - curl_http.c for details. */ + 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 curl_transfer.c:readwrite_data() - to allow the protocol to do extra reads/writes */ + /* If used, this function gets called from 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); @@ -1068,7 +1068,7 @@ struct Progress { bool callback; /* set when progress callback is used */ int width; /* screen width at download start */ - int flags; /* see curl_progress.h */ + int flags; /* see progress.h */ double timespent; @@ -1276,7 +1276,7 @@ struct UrlState { struct FTP *ftp; /* void *tftp; not used */ struct FILEPROTO *file; - void *telnet; /* private for curl_telnet.c-eyes only */ + void *telnet; /* private for 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 curl_multi.c */ -struct Curl_multi; /* declared and used only in curl_multi.c */ +struct Curl_one_easy; /* declared and used only in multi.c */ +struct Curl_multi; /* declared and used only in multi.c */ enum dupstring { STRING_CERT, /* client certificate file name */ diff --git a/lib/curl_version.c b/lib/version.c index fe1f73660..ef8353ae2 100644 --- a/lib/curl_version.c +++ b/lib/version.c @@ -20,11 +20,11 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #include <curl/curl.h> -#include "curl_urldata.h" -#include "curl_sslgen.h" +#include "urldata.h" +#include "sslgen.h" #define _MPRINTF_REPLACE /* use the internal *printf() functions */ #include <curl/mprintf.h> diff --git a/lib/curl_warnless.c b/lib/warnless.c index 30cdbe6f0..9cc7be9d3 100644 --- a/lib/curl_warnless.c +++ b/lib/warnless.c @@ -20,7 +20,7 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #if defined(__INTEL_COMPILER) && defined(__unix__) @@ -35,7 +35,7 @@ #define BUILDING_WARNLESS_C 1 -#include "curl_warnless.h" +#include "warnless.h" #define CURL_MASK_SCHAR 0x7F #define CURL_MASK_UCHAR 0xFF diff --git a/lib/curl_warnless.h b/lib/warnless.h index 9d690d62c..9d690d62c 100644 --- a/lib/curl_warnless.h +++ b/lib/warnless.h diff --git a/lib/curl_wildcard.c b/lib/wildcard.c index d6ba2b276..6f4c7380c 100644 --- a/lib/curl_wildcard.c +++ b/lib/wildcard.c @@ -20,18 +20,18 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" -#include "curl_wildcard.h" -#include "curl_llist.h" -#include "curl_fileinfo.h" +#include "wildcard.h" +#include "llist.h" +#include "fileinfo.h" #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> #include "curl_memory.h" /* The last #include file should be: */ -#include "curl_memdebug.h" +#include "memdebug.h" CURLcode Curl_wildcard_init(struct WildcardData *wc) { diff --git a/lib/curl_wildcard.h b/lib/wildcard.h index 8f732d106..8f732d106 100644 --- a/lib/curl_wildcard.h +++ b/lib/wildcard.h |