Revert changes relative to lib/*.[ch] recent renaming

This reverts renaming and usage of lib/*.h header files done
28-12-2012, reverting 2 commits:

  f871de0... build: make use of 76 lib/*.h renamed files
  ffd8e12... build: rename 76 lib/*.h files

This also reverts removal of redundant include guard (redundant thanks
to changes in above commits) done 2-12-2013, reverting 1 commit:

  c087374... curl_setup.h: remove redundant include guard

This also reverts renaming and usage of lib/*.c source files done
3-12-2013, reverting 3 commits:

  13606bb... build: make use of 93 lib/*.c renamed files
  5b6e792... build: rename 93 lib/*.c files
  7d83dff... build: commit 13606bbfde follow-up 1

Start of related discussion thread:

  http://curl.haxx.se/mail/lib-2013-01/0012.html

Asking for confirmation on pushing this revertion commit:

  http://curl.haxx.se/mail/lib-2013-01/0048.html

Confirmation summary:

  http://curl.haxx.se/mail/lib-2013-01/0079.html

NOTICE: The list of 2 files that have been modified by other
intermixed commits, while renamed, and also by at least one
of the 6 commits this one reverts follows below. These 2 files
will exhibit a hole in history unless git's '--follow' option
is used when viewing logs.

  lib/curl_imap.h
  lib/curl_smtp.h

CMakeLists.txt

@@ -769,13 +769,13 @@ if(CMAKE_COMPILER_IS_GNUCC AND APPLE)
   check_c_compiler_flag(-Wno-long-double HAVE_C_FLAG_Wno_long_double)
   if(HAVE_C_FLAG_Wno_long_double)
     # The Mac version of GCC warns about use of long double.  Disable it.
-    get_source_file_property(MPRINTF_COMPILE_FLAGS curl_mprintf.c COMPILE_FLAGS)
+    get_source_file_property(MPRINTF_COMPILE_FLAGS mprintf.c COMPILE_FLAGS)
     if(MPRINTF_COMPILE_FLAGS)
       set(MPRINTF_COMPILE_FLAGS "${MPRINTF_COMPILE_FLAGS} -Wno-long-double")
     else(MPRINTF_COMPILE_FLAGS)
       set(MPRINTF_COMPILE_FLAGS "-Wno-long-double")
     endif(MPRINTF_COMPILE_FLAGS)
-    set_source_files_properties(curl_mprintf.c PROPERTIES
+    set_source_files_properties(mprintf.c PROPERTIES
       COMPILE_FLAGS ${MPRINTF_COMPILE_FLAGS})
   endif(HAVE_C_FLAG_Wno_long_double)
 endif(CMAKE_COMPILER_IS_GNUCC AND APPLE)

buildconf

@@ -81,7 +81,7 @@ removethis(){
 #
 if test ! -f configure.ac ||
   test ! -f src/tool_main.c ||
-  test ! -f lib/curl_urldata.h ||
+  test ! -f lib/urldata.h ||
   test ! -f include/curl/curl.h ||
   test ! -f m4/curl-functions.m4; then
   echo "Can not run buildconf from outside of curl's source subdirectory!"

configure.ac

@@ -34,7 +34,7 @@ AC_COPYRIGHT([Copyright (c) 1998 - 2012 Daniel Stenberg, <daniel@haxx.se>
 This configure script may be copied, distributed and modified under the
 terms of the curl license; see COPYING for more details])
 
-AC_CONFIG_SRCDIR([lib/curl_urldata.h])
+AC_CONFIG_SRCDIR([lib/urldata.h])
 AC_CONFIG_HEADERS(lib/curl_config.h include/curl/curlbuild.h)
 AC_CONFIG_MACRO_DIR([m4])
 AM_MAINTAINER_MODE

docs/INSTALL

@@ -464,7 +464,7 @@ Win32
    possibilities:
 
    - Modify lib/config-win32.h
-   - Modify lib/curl_setup.h
+   - Modify lib/setup.h
    - Modify lib/Makefile.vc6
    - Add defines to Project/Settings/C/C++/General/Preprocessor Definitions
      in the vc6libcurl.dsw/vc6libcurl.dsp Visual C++ 6 IDE project.

docs/INTERNALS

@@ -114,15 +114,15 @@ Library
  There are plenty of entry points to the library, namely each publicly defined
  function that libcurl offers to applications. All of those functions are
  rather small and easy-to-follow. All the ones prefixed with 'curl_easy' are
- put in the lib/curl_easy.c file.
+ put in the lib/easy.c file.
 
  curl_global_init_() and curl_global_cleanup() should be called by the
  application to initialize and clean up global stuff in the library. As of
  today, it can handle the global SSL initing if SSL is enabled and it can init
  the socket layer on windows machines. libcurl itself has no "global" scope.
 
- All printf()-style functions use the supplied clones in lib/curl_mprintf.c.
+ All printf()-style functions use the supplied clones in lib/mprintf.c. This
- This makes sure we stay absolutely platform independent.
+ makes sure we stay absolutely platform independent.
 
  curl_easy_init() allocates an internal struct and makes some initializations.
  The returned handle does not reveal internals. This is the 'SessionHandle'
@@ -137,17 +137,17 @@ Library
 
  curl_easy_perform() does a whole lot of things:
 
- It starts off in the lib/curl_easy.c file by calling Curl_perform() and the
+ It starts off in the lib/easy.c file by calling Curl_perform() and the main
- main work then continues in lib/curl_url.c. The flow continues with a call to
+ work then continues in lib/url.c. The flow continues with a call to
  Curl_connect() to connect to the remote site.
 
  o Curl_connect()
 
    ... analyzes the URL, it separates the different components and connects to
    the remote host. This may involve using a proxy and/or using SSL. The
-   Curl_resolv() function in lib/curl_hostip.c is used for looking up host
+   Curl_resolv() function in lib/hostip.c is used for looking up host names
-   names (it does then use the proper underlying method, which may vary
+   (it does then use the proper underlying method, which may vary between
-   between platforms and builds).
+   platforms and builds).
 
    When Curl_connect is done, we are connected to the remote site. Then it is
    time to tell the server to get a document/file. Curl_do() arranges this.
@@ -162,15 +162,15 @@ Library
    Curl_do() makes sure the proper protocol-specific function is called. The
    functions are named after the protocols they handle. Curl_ftp(),
    Curl_http(), Curl_dict(), etc. They all reside in their respective files
-   (curl_ftp.c, curl_http.c and curl_dict.c). HTTPS is handled by Curl_http()
+   (ftp.c, http.c and dict.c). HTTPS is handled by Curl_http() and FTPS by
-   and FTPS by Curl_ftp().
+   Curl_ftp().
 
    The protocol-specific functions of course deal with protocol-specific
    negotiations and setup. They have access to the Curl_sendf() (from
-   lib/curl_sendf.c) function to send printf-style formatted data to the
+   lib/sendf.c) function to send printf-style formatted data to the remote
-   remote host and when they're ready to make the actual file transfer they
+   host and when they're ready to make the actual file transfer they call the
-   call the Curl_Transfer() function (in lib/curl_transfer.c) to setup the
+   Curl_Transfer() function (in lib/transfer.c) to setup the transfer and
-   transfer and returns.
+   returns.
 
    If this DO function fails and the connection is being re-used, libcurl will
    then close this connection, setup a new connection and re-issue the DO
@@ -184,13 +184,13 @@ Library
 
  o Transfer()
 
-   Curl_perform() then calls Transfer() in lib/curl_transfer.c that performs
+   Curl_perform() then calls Transfer() in lib/transfer.c that performs the
-   the entire file transfer.
+   entire file transfer.
 
-   During transfer, the progress functions in lib/curl_progress.c are called
+   During transfer, the progress functions in lib/progress.c are called at a
-   at a frequent interval (or at the user's choice, a specified callback
+   frequent interval (or at the user's choice, a specified callback might get
-   might get called). The speedcheck functions in lib/curl_speedcheck.c are
+   called). The speedcheck functions in lib/speedcheck.c are also used to
-   also used to verify that the transfer is as fast as required.
+   verify that the transfer is as fast as required.
 
  o Curl_done()
 
@@ -238,11 +238,11 @@ Library
  HTTP(S)
 
  HTTP offers a lot and is the protocol in curl that uses the most lines of
- code. There is a special file (lib/curl_formdata.c) that offers all the
+ code. There is a special file (lib/formdata.c) that offers all the multipart
- multipart post functions.
+ post functions.
 
- base64-functions for user+password stuff (and more) is in (lib/curl_base64.c)
+ base64-functions for user+password stuff (and more) is in (lib/base64.c) and
- and all functions for parsing and sending cookies in (lib/curl_cookie.c).
+ all functions for parsing and sending cookies are found in (lib/cookie.c).
 
  HTTPS uses in almost every means the same procedure as HTTP, with only two
  exceptions: the connect procedure is different and the function used to read
@@ -250,8 +250,8 @@ Library
  the source by the use of Curl_read() for reading and Curl_write() for writing
  data to the remote server.
 
- curl_http_chunks.c contains functions that understands HTTP 1.1 chunked
+ http_chunks.c contains functions that understands HTTP 1.1 chunked transfer
- transfer encoding.
+ encoding.
 
  An interesting detail with the HTTP(S) request, is the Curl_add_buffer()
  series of functions we use. They append data to one single buffer, and when
@@ -261,7 +261,7 @@ Library
  FTP
 
  The Curl_if2ip() function can be used for getting the IP number of a
- specified network interface, and it resides in lib/curl_if2ip.c.
+ specified network interface, and it resides in lib/if2ip.c.
 
  Curl_ftpsendf() is used for sending FTP commands to the remote server. It was
  made a separate function to prevent us programmers from forgetting that they
@@ -270,42 +270,41 @@ Library
 
  Kerberos
 
- The kerberos support is mainly in lib/curl_krb4.c and lib/curl_security.c.
+ The kerberos support is mainly in lib/krb4.c and lib/security.c.
 
  TELNET
 
- Telnet is implemented in lib/curl_telnet.c.
+ Telnet is implemented in lib/telnet.c.
 
  FILE
 
- The file:// protocol is dealt with in lib/curl_file.c.
+ The file:// protocol is dealt with in lib/file.c.
 
  LDAP
 
- Everything LDAP is in lib/curl_ldap.c and lib/curl_openldap.c
+ Everything LDAP is in lib/ldap.c and lib/openldap.c
 
  GENERAL
 
  URL encoding and decoding, called escaping and unescaping in the source code,
- is found in lib/curl_escape.c.
+ is found in lib/escape.c.
 
  While transferring data in Transfer() a few functions might get used.
- curl_getdate() in lib/curl_parsedate.c is for HTTP date comparisons (and
+ curl_getdate() in lib/parsedate.c is for HTTP date comparisons (and more).
- more).
 
- lib/curl_getenv.c offers curl_getenv() which is for reading environment
+ lib/getenv.c offers curl_getenv() which is for reading environment variables
- variables in a neat platform independent way. That's used in the client,
+ in a neat platform independent way. That's used in the client, but also in
- but also in lib/curl_url.c when checking the proxy environment variables.
+ lib/url.c when checking the proxy environment variables. Note that contrary
- Note that contrary to the normal unix getenv(), this returns an allocated
+ to the normal unix getenv(), this returns an allocated buffer that must be
- buffer that must be free()ed after use.
+ free()ed after use.
 
- lib/curl_netrc.c holds the .netrc parser
+ lib/netrc.c holds the .netrc parser
 
- lib/curl_timeval.c features replacement functions for systems that don't have
+ lib/timeval.c features replacement functions for systems that don't have
  gettimeofday() and a few support functions for timeval conversions.
 
  A function named curl_version() that returns the full curl version string is
- found in lib/curl_version.c.
+ found in lib/version.c.
 
 Persistent Connections
 ======================
@@ -409,10 +408,10 @@ API/ABI
 Client
 ======
 
- main() resides in src/tool_main.c together with most of the client code.
+ main() resides in src/main.c together with most of the client code.
 
  src/tool_hugehelp.c is automatically generated by the mkhelp.pl perl script
- to display the complete "manual" and the src/tool_urlglob.c file holds the
+ to display the complete "manual" and the src/urlglob.c file holds the
  functions used for the URL-"globbing" support. Globbing in the sense that
  the {} and [] expansion stuff is there.
 
@@ -421,10 +420,10 @@ Client
  control after the curl_easy_perform() it cleans up the library, checks status
  and exits.
 
- When the operation is done, the ourWriteOut() function in
+ When the operation is done, the ourWriteOut() function in src/writeout.c may
- src/tool_writeout.c may be called to report about the operation. That
+ be called to report about the operation. That function is using the
- function is using the curl_easy_getinfo() function to extract useful
+ curl_easy_getinfo() function to extract useful information from the curl
- information from the curl session.
+ session.
 
  Recent versions may loop and do all this several times if many URLs were
  specified on the command line or config file.
@@ -432,12 +431,12 @@ Client
 Memory Debugging
 ================
 
- The file lib/curl_memdebug.c contains debug-versions of a few functions.
+ The file lib/memdebug.c contains debug-versions of a few functions. Functions
- Functions such as malloc, free, fopen, fclose, etc that somehow deal with
+ such as malloc, free, fopen, fclose, etc that somehow deal with resources
- resources that might give us problems if we "leak" them. The functions in
+ that might give us problems if we "leak" them. The functions in the memdebug
- the memory tracking system do nothing fancy, they do their normal function
+ system do nothing fancy, they do their normal function and then log
- and then log information about what they just did. The logged data can then
+ information about what they just did. The logged data can then be analyzed
- be analyzed after a complete session,
+ after a complete session,
 
  memanalyze.pl is the perl script present in tests/ that analyzes a log file
  generated by the memory tracking system. It detects if resources are

docs/TODO

@@ -541,8 +541,8 @@ to provide the data to send.
 
 19.1 http-style HEAD output for ftp
 
- #undef CURL_FTP_HTTPSTYLE_HEAD in lib/curl_ftp.c to remove the HTTP-style
+ #undef CURL_FTP_HTTPSTYLE_HEAD in lib/ftp.c to remove the HTTP-style headers
- headers from being output in NOBODY requests over ftp
+ from being output in NOBODY requests over ftp
 
 19.2 combine error codes
 

include/curl/curlrules.h

@@ -190,7 +190,7 @@ typedef char
  * CURL_ISOCPP and CURL_OFF_T_C definitions are done here in order to allow
  * these to be visible and exported by the external libcurl interface API,
  * while also making them visible to the library internals, simply including
- * curl_setup.h, without actually needing to include curl.h internally.
+ * setup.h, without actually needing to include curl.h internally.
  * If some day this section would grow big enough, all this should be moved
  * to its own header file.
  */

lib/CMakeLists.txt

@@ -18,18 +18,18 @@ if(MSVC)
 endif()
 
 # SET(CSOURCES
-# # curl_memdebug.c -not used
+# #  memdebug.c -not used
-# # curl_nwlib.c - Not used
+# # nwlib.c - Not used
-# # curl_strtok.c - specify later
+# # strtok.c - specify later
-# # curl_strtoofft.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
+# krb4.c
-# curl_security.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
+    cookie.c
-    curl_easy.c
+    easy.c
-    curl_formdata.c
+    formdata.c
-    curl_getenv.c
+    getenv.c
-    curl_nonblock.c
+    nonblock.c
-    curl_hash.c
+    hash.c
-    curl_http.c
+    http.c
-    curl_if2ip.c
+    if2ip.c
-    curl_mprintf.c
+    mprintf.c
-    curl_multi.c
+    multi.c
-    curl_sendf.c
+    sendf.c
-    curl_telnet.c
+    telnet.c
-    curl_transfer.c
+    transfer.c
-    curl_url.c
+    url.c
     COMPILE_FLAGS -D_BSD_SOURCE)
 endif(HAVE_FEATURES_H)
 

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 = \
+EXTRA_DIST = Makefile.b32 Makefile.m32 Makefile.vc6 $(DSP)              \
- $(CMAKE_DIST) \
+ vc6libcurl.dsw config-win32.h config-win32ce.h config-riscos.h         \
- $(DOCS) \
+ config-mac.h curl_config.h.in makefile.dj config-dos.h libcurl.plist   \
- $(DSP) \
+ libcurl.rc config-amigaos.h makefile.amiga                             \
- $(VCPROJ) \
+ Makefile.netware nwlib.c nwos.c msvcproj.head msvcproj.foot		\
- Makefile.Watcom \
+ config-win32ce.h config-os400.h setup-os400.h config-symbian.h		\
- Makefile.b32 \
+ Makefile.Watcom config-tpf.h $(DOCS) $(VCPROJ) mk-ca-bundle.pl		\
- Makefile.m32 \
+ mk-ca-bundle.vbs firefox-db2pem.sh $(CMAKE_DIST) config-vxworks.h	\
- Makefile.netware \
+ Makefile.vxworks config-vms.h checksrc.pl objnames-test08.sh		\
- Makefile.vc6 \
+ objnames-test10.sh objnames.inc
- 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
 
 CLEANFILES = $(DSP) $(VCPROJ)
 

lib/Makefile.inc

@@ -7,214 +7,40 @@
 # CSRC2 = file4.c file5.c file6.c
 # CSOURCES = $(CSRC1) $(CSRC2)
 
-CSOURCES = \
+CSOURCES = file.c timeval.c base64.c hostip.c progress.c formdata.c	\
-  curl_amigaos.c \
+  cookie.c http.c sendf.c ftp.c url.c dict.c if2ip.c speedcheck.c	\
-  curl_asyn_ares.c \
+  ldap.c ssluse.c version.c getenv.c escape.c mprintf.c telnet.c	\
-  curl_asyn_thread.c \
+  netrc.c getinfo.c transfer.c strequal.c easy.c security.c krb4.c	\
-  curl_axtls.c \
+  curl_fnmatch.c fileinfo.c ftplistparser.c wildcard.c krb5.c		\
-  curl_base64.c \
+  memdebug.c http_chunks.c strtok.c connect.c llist.c hash.c multi.c	\
-  curl_bundles.c \
+  content_encoding.c share.c http_digest.c md4.c md5.c curl_rand.c	\
-  curl_conncache.c \
+  http_negotiate.c inet_pton.c strtoofft.c strerror.c amigaos.c		\
-  curl_connect.c \
+  hostasyn.c hostip4.c hostip6.c hostsyn.c inet_ntop.c parsedate.c	\
-  curl_content_encoding.c \
+  select.c gtls.c sslgen.c tftp.c splay.c strdup.c socks.c ssh.c nss.c	\
-  curl_cookie.c \
+  qssl.c rawstr.c curl_addrinfo.c socks_gssapi.c socks_sspi.c		\
-  curl_addrinfo.c \
+  curl_sspi.c slist.c nonblock.c curl_memrchr.c imap.c pop3.c smtp.c	\
-  curl_darwinssl.c \
+  pingpong.c rtsp.c curl_threads.c warnless.c hmac.c polarssl.c		\
-  curl_fnmatch.c \
+  curl_rtmp.c openldap.c curl_gethostname.c gopher.c axtls.c		\
-  curl_gethostname.c \
+  idn_win32.c http_negotiate_sspi.c cyassl.c http_proxy.c non-ascii.c	\
-  curl_gssapi.c \
+  asyn-ares.c asyn-thread.c curl_gssapi.c curl_ntlm.c curl_ntlm_wb.c	\
-  curl_memrchr.c \
+  curl_ntlm_core.c curl_ntlm_msgs.c curl_sasl.c curl_schannel.c	        \
-  curl_multibyte.c \
+  curl_multibyte.c curl_darwinssl.c hostcheck.c                         \
-  curl_ntlm.c \
+  bundles.c conncache.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
 
+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

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
 

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)\asyn-ares.obj \
-	$(DIROBJ)\curl_asyn_thread.obj \
+	$(DIROBJ)\asyn-thread.obj \
-	$(DIROBJ)\curl_base64.obj \
+	$(DIROBJ)\base64.obj \
-	$(DIROBJ)\curl_bundles.obj \
+	$(DIROBJ)\bundles.obj \
-	$(DIROBJ)\curl_conncache.obj \
+	$(DIROBJ)\conncache.obj \
-	$(DIROBJ)\curl_connect.obj \
+	$(DIROBJ)\connect.obj \
-	$(DIROBJ)\curl_content_encoding.obj \
+	$(DIROBJ)\content_encoding.obj \
-	$(DIROBJ)\curl_cookie.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)\dict.obj \
-	$(DIROBJ)\curl_easy.obj \
+	$(DIROBJ)\easy.obj \
-	$(DIROBJ)\curl_escape.obj \
+	$(DIROBJ)\escape.obj \
-	$(DIROBJ)\curl_file.obj \
+	$(DIROBJ)\file.obj \
-	$(DIROBJ)\curl_fileinfo.obj \
+	$(DIROBJ)\fileinfo.obj \
-	$(DIROBJ)\curl_formdata.obj \
+	$(DIROBJ)\formdata.obj \
-	$(DIROBJ)\curl_ftp.obj \
+	$(DIROBJ)\ftp.obj \
-	$(DIROBJ)\curl_ftplistparser.obj \
+	$(DIROBJ)\ftplistparser.obj \
-	$(DIROBJ)\curl_getenv.obj \
+	$(DIROBJ)\getenv.obj \
-	$(DIROBJ)\curl_getinfo.obj \
+	$(DIROBJ)\getinfo.obj \
-	$(DIROBJ)\curl_gopher.obj \
+	$(DIROBJ)\gopher.obj \
-	$(DIROBJ)\curl_gtls.obj \
+	$(DIROBJ)\gtls.obj \
-	$(DIROBJ)\curl_hash.obj \
+	$(DIROBJ)\hash.obj \
-	$(DIROBJ)\curl_hmac.obj \
+	$(DIROBJ)\hmac.obj \
-	$(DIROBJ)\curl_hostasyn.obj \
+	$(DIROBJ)\hostasyn.obj \
-	$(DIROBJ)\curl_hostcheck.obj \
+	$(DIROBJ)\hostcheck.obj \
-	$(DIROBJ)\curl_hostip.obj \
+	$(DIROBJ)\hostip.obj \
-	$(DIROBJ)\curl_hostip4.obj \
+	$(DIROBJ)\hostip4.obj \
-	$(DIROBJ)\curl_hostip6.obj \
+	$(DIROBJ)\hostip6.obj \
-	$(DIROBJ)\curl_hostsyn.obj \
+	$(DIROBJ)\hostsyn.obj \
-	$(DIROBJ)\curl_http.obj \
+	$(DIROBJ)\http.obj \
-	$(DIROBJ)\curl_http_chunks.obj \
+	$(DIROBJ)\http_chunks.obj \
-	$(DIROBJ)\curl_http_digest.obj \
+	$(DIROBJ)\http_digest.obj \
-	$(DIROBJ)\curl_http_negotiate.obj \
+	$(DIROBJ)\http_negotiate.obj \
-	$(DIROBJ)\curl_http_negotiate_sspi.obj \
+	$(DIROBJ)\http_negotiate_sspi.obj \
-	$(DIROBJ)\curl_http_proxy.obj \
+	$(DIROBJ)\http_proxy.obj \
-	$(DIROBJ)\curl_if2ip.obj \
+	$(DIROBJ)\if2ip.obj \
-	$(DIROBJ)\curl_imap.obj \
+	$(DIROBJ)\imap.obj \
-	$(DIROBJ)\curl_inet_ntop.obj \
+	$(DIROBJ)\inet_ntop.obj \
-	$(DIROBJ)\curl_inet_pton.obj \
+	$(DIROBJ)\inet_pton.obj \
-	$(DIROBJ)\curl_ldap.obj \
+	$(DIROBJ)\ldap.obj \
-	$(DIROBJ)\curl_llist.obj \
+	$(DIROBJ)\llist.obj \
-	$(DIROBJ)\curl_md4.obj \
+	$(DIROBJ)\md4.obj \
-	$(DIROBJ)\curl_md5.obj \
+	$(DIROBJ)\md5.obj \
-	$(DIROBJ)\curl_memdebug.obj \
+	$(DIROBJ)\memdebug.obj \
-	$(DIROBJ)\curl_mprintf.obj \
+	$(DIROBJ)\mprintf.obj \
-	$(DIROBJ)\curl_multi.obj \
+	$(DIROBJ)\multi.obj \
-	$(DIROBJ)\curl_netrc.obj \
+	$(DIROBJ)\netrc.obj \
-	$(DIROBJ)\curl_nonblock.obj \
+	$(DIROBJ)\nonblock.obj \
-	$(DIROBJ)\curl_openldap.obj \
+	$(DIROBJ)\openldap.obj \
-	$(DIROBJ)\curl_parsedate.obj \
+	$(DIROBJ)\parsedate.obj \
-	$(DIROBJ)\curl_pingpong.obj \
+	$(DIROBJ)\pingpong.obj \
-	$(DIROBJ)\curl_polarssl.obj \
+	$(DIROBJ)\polarssl.obj \
-	$(DIROBJ)\curl_pop3.obj \
+	$(DIROBJ)\pop3.obj \
-	$(DIROBJ)\curl_progress.obj \
+	$(DIROBJ)\progress.obj \
-	$(DIROBJ)\curl_rawstr.obj \
+	$(DIROBJ)\rawstr.obj \
-	$(DIROBJ)\curl_rtsp.obj \
+	$(DIROBJ)\rtsp.obj \
-	$(DIROBJ)\curl_select.obj \
+	$(DIROBJ)\select.obj \
-	$(DIROBJ)\curl_sendf.obj \
+	$(DIROBJ)\sendf.obj \
-	$(DIROBJ)\curl_share.obj \
+	$(DIROBJ)\share.obj \
-	$(DIROBJ)\curl_slist.obj \
+	$(DIROBJ)\slist.obj \
-	$(DIROBJ)\curl_smtp.obj \
+	$(DIROBJ)\smtp.obj \
-	$(DIROBJ)\curl_socks.obj \
+	$(DIROBJ)\socks.obj \
-	$(DIROBJ)\curl_socks_gssapi.obj \
+	$(DIROBJ)\socks_gssapi.obj \
-	$(DIROBJ)\curl_socks_sspi.obj \
+	$(DIROBJ)\socks_sspi.obj \
-	$(DIROBJ)\curl_speedcheck.obj \
+	$(DIROBJ)\speedcheck.obj \
-	$(DIROBJ)\curl_splay.obj \
+	$(DIROBJ)\splay.obj \
-	$(DIROBJ)\curl_ssh.obj \
+	$(DIROBJ)\ssh.obj \
-	$(DIROBJ)\curl_sslgen.obj \
+	$(DIROBJ)\sslgen.obj \
-	$(DIROBJ)\curl_ssluse.obj \
+	$(DIROBJ)\ssluse.obj \
-	$(DIROBJ)\curl_strequal.obj \
+	$(DIROBJ)\strequal.obj \
-	$(DIROBJ)\curl_strerror.obj \
+	$(DIROBJ)\strerror.obj \
-	$(DIROBJ)\curl_strtok.obj \
+	$(DIROBJ)\strtok.obj \
-	$(DIROBJ)\curl_strtoofft.obj \
+	$(DIROBJ)\strtoofft.obj \
-	$(DIROBJ)\curl_telnet.obj \
+	$(DIROBJ)\telnet.obj \
-	$(DIROBJ)\curl_tftp.obj \
+	$(DIROBJ)\tftp.obj \
-	$(DIROBJ)\curl_timeval.obj \
+	$(DIROBJ)\timeval.obj \
-	$(DIROBJ)\curl_transfer.obj \
+	$(DIROBJ)\transfer.obj \
-	$(DIROBJ)\curl_url.obj \
+	$(DIROBJ)\url.obj \
-	$(DIROBJ)\curl_version.obj \
+	$(DIROBJ)\version.obj \
-	$(DIROBJ)\curl_warnless.obj \
+	$(DIROBJ)\warnless.obj \
-	$(DIROBJ)\curl_wildcard.obj \
+	$(DIROBJ)\wildcard.obj \
 	$(RESOURCE)
 
 all : $(TARGET)

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().
 

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
+ hostip.c   - method-independent resolver functions and utility functions
- curl_hostasyn.c - functions for asynchronous name resolves
+ hostasyn.c - functions for asynchronous name resolves
- curl_hostsyn.c  - functions for synchronous name resolves
+ hostsyn.c  - functions for synchronous name resolves
- curl_hostares.c - functions for ares-using name resolves
+ hostares.c - functions for ares-using name resolves
- curl_hostthre.c - functions for threaded name resolves
+ hostthre.c - functions for threaded name resolves
- curl_hostip4.c  - ipv4-specific functions
+ hostip4.c  - ipv4-specific functions
- curl_hostip6.c  - ipv6-specific functions
+ hostip6.c  - ipv6-specific functions
 
- The curl_hostip.h is the single united header file for all this. It defines
+ The hostip.h is the single united header file for all this. It defines the
- the CURLRES_* defines based on the config*.h and curl_setup.h defines.
+ CURLRES_* defines based on the config*.h and setup.h defines.

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;

lib/amigaos.h

@@ -21,7 +21,7 @@
  * KIND, either express or implied.
  *
  ***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
 
 #if defined(__AMIGA__) && !defined(__ixemul__)
 

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 "urldata.h"
-#include "curl_sendf.h"
+#include "sendf.h"
-#include "curl_hostip.h"
+#include "hostip.h"
-#include "curl_hash.h"
+#include "hash.h"
-#include "curl_share.h"
+#include "share.h"
-#include "curl_strerror.h"
+#include "strerror.h"
-#include "curl_url.h"
+#include "url.h"
-#include "curl_multiif.h"
+#include "multiif.h"
-#include "curl_inet_pton.h"
+#include "inet_pton.h"
-#include "curl_connect.h"
+#include "connect.h"
-#include "curl_select.h"
+#include "select.h"
-#include "curl_progress.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 */

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 "urldata.h"
-#include "curl_sendf.h"
+#include "sendf.h"
-#include "curl_hostip.h"
+#include "hostip.h"
-#include "curl_hash.h"
+#include "hash.h"
-#include "curl_share.h"
+#include "share.h"
-#include "curl_strerror.h"
+#include "strerror.h"
-#include "curl_url.h"
+#include "url.h"
-#include "curl_multiif.h"
+#include "multiif.h"
-#include "curl_inet_pton.h"
+#include "inet_pton.h"
-#include "curl_inet_ntop.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

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
+ * asyn-ares.c and asyn-thread.c are the current implementations of asynch
- * asynch resolver backends.
+ * resolver backends.
  */
 
 /*

lib/axtls.c

@@ -5,8 +5,8 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 2010, DirecTV * contact: Eric Hu <ehu@directv.com>
+ * Copyright (C) 2010, DirecTV
- * Copyright (C) 2010 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * 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 "axtls.h"
 
-#include "curl_sendf.h"
+#include "sendf.h"
-#include "curl_inet_pton.h"
+#include "inet_pton.h"
-#include "curl_sslgen.h"
+#include "sslgen.h"
-#include "curl_parsedate.h"
+#include "parsedate.h"
-#include "curl_connect.h" /* for the connect timeout */
+#include "connect.h" /* for the connect timeout */
-#include "curl_select.h"
+#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 "memdebug.h"
-#include "curl_hostcheck.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
+  /* Outline taken from ssluse.c since functions are in axTLS compat layer.
-     layer.  axTLS's error set is much smaller, so a lot of error-handling
+     axTLS's error set is much smaller, so a lot of error-handling was removed.
-     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:
+  /* ssluse.c line: rc = SSL_peek(conn->ssl[FIRSTSOCKET].ssl, (void*)&buf, 1);
-     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
+  /* both ssluse.c and gtls.c do something here, but axTLS's OpenSSL
-     OpenSSL compatibility layer does nothing, so we do nothing too. */
+     compatibility layer does nothing, so we do nothing too. */
 }
 
 size_t Curl_axtls_version(char *buffer, size_t size)

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);

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 "urldata.h" /* for the SessionHandle definition */
-#include "curl_warnless.h"
+#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 memdebug.h last */
-#include "curl_memdebug.h"
+#include "memdebug.h"
 
 /* ---- Base64 Encoding/Decoding Table --- */
 static const char table64[]=

lib/bundles.c

@@ -21,21 +21,21 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #include <curl/curl.h>
 
-#include "curl_urldata.h"
+#include "urldata.h"
-#include "curl_url.h"
+#include "url.h"
-#include "curl_progress.h"
+#include "progress.h"
-#include "curl_multiif.h"
+#include "multiif.h"
-#include "curl_bundles.h"
+#include "bundles.h"
-#include "curl_sendf.h"
+#include "sendf.h"
-#include "curl_rawstr.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)
 {

lib/conncache.c

@@ -21,22 +21,22 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #include <curl/curl.h>
 
-#include "curl_urldata.h"
+#include "urldata.h"
-#include "curl_url.h"
+#include "url.h"
-#include "curl_progress.h"
+#include "progress.h"
-#include "curl_multiif.h"
+#include "multiif.h"
-#include "curl_sendf.h"
+#include "sendf.h"
-#include "curl_rawstr.h"
+#include "rawstr.h"
-#include "curl_bundles.h"
+#include "bundles.h"
-#include "curl_conncache.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
 

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 "urldata.h"
-#include "curl_sendf.h"
+#include "sendf.h"
-#include "curl_if2ip.h"
+#include "if2ip.h"
-#include "curl_strerror.h"
+#include "strerror.h"
-#include "curl_connect.h"
+#include "connect.h"
 #include "curl_memory.h"
-#include "curl_select.h"
+#include "select.h"
-#include "curl_url.h"
+#include "url.h" /* for Curl_safefree() */
-#include "curl_multiif.h"
+#include "multiif.h"
-#include "curl_sockaddr.h" /* required for Curl_sockaddr_storage */
+#include "sockaddr.h" /* required for Curl_sockaddr_storage */
-#include "curl_inet_ntop.h"
+#include "inet_ntop.h"
-#include "curl_inet_pton.h"
+#include "inet_pton.h"
-#include "curl_sslgen.h" /* for Curl_ssl_check_cxn() */
+#include "sslgen.h" /* for Curl_ssl_check_cxn() */
-#include "curl_progress.h"
+#include "progress.h"
-#include "curl_warnless.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 */

lib/connect.h

@@ -21,10 +21,10 @@
  * KIND, either express or implied.
  *
  ***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
 
-#include "curl_nonblock.h"
+#include "nonblock.h" /* for curlx_nonblock(), formerly Curl_nonblock() */
-#include "curl_sockaddr.h"
+#include "sockaddr.h"
 
 CURLcode Curl_is_connected(struct connectdata *conn,
                            int sockindex,

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 "sendf.h"
-#include "curl_content_encoding.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). */

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)

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 "urldata.h"
-#include "curl_cookie.h"
+#include "cookie.h"
-#include "curl_strequal.h"
+#include "strequal.h"
-#include "curl_strtok.h"
+#include "strtok.h"
-#include "curl_sendf.h"
+#include "sendf.h"
 #include "curl_memory.h"
-#include "curl_share.h"
+#include "share.h"
-#include "curl_strtoofft.h"
+#include "strtoofft.h"
-#include "curl_rawstr.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)
 {

lib/cookie.h

@@ -21,7 +21,7 @@
  * KIND, either express or implied.
  *
  ***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
 
 #include <curl/curl.h>
 

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 "inet_pton.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"
 
 
 /*
@@ -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
+ * family otherwise present in memdebug.c. I put these ones here since they
- * they require a bunch of structs I didn't want to include there.
+ * 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
+ * family otherwise present in memdebug.c. I put these ones here since they
- * they require a bunch of structs I didn't want to include there.
+ * require a bunch of structs I didn't want to include in memdebug.c
  */
 
 int

lib/curl_addrinfo.h

@@ -22,7 +22,7 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #ifdef HAVE_NETINET_IN_H
 #  include <netinet/in.h>

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
+ * TLS/SSL layer. No code but sslgen.c should ever call or use these functions.
- * 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 "urldata.h"
-#include "curl_sendf.h"
+#include "sendf.h"
-#include "curl_inet_pton.h"
+#include "inet_pton.h"
-#include "curl_connect.h"
+#include "connect.h"
-#include "curl_select.h"
+#include "select.h"
-#include "curl_sslgen.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

lib/curl_darwinssl.h

@@ -21,7 +21,7 @@
  * KIND, either express or implied.
  *
  ***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
 
 #ifdef USE_DARWINSSL
 

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)

lib/curl_gethostname.c

@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #include "curl_gethostname.h"
 

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,

lib/curl_gssapi.h

@@ -22,8 +22,8 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
-#include "curl_urldata.h"
+#include "urldata.h"
 
 #ifdef HAVE_GSSAPI
 

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 */

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
 

lib/curl_memrchr.h

@@ -22,7 +22,7 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #ifdef HAVE_MEMRCHR
 

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)
 {

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))
 

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 "urldata.h"
-#include "curl_sendf.h"
+#include "sendf.h"
-#include "curl_rawstr.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

lib/curl_ntlm.h

@@ -22,7 +22,7 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #ifdef USE_NTLM
 

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 "urldata.h"
-#include "curl_non_ascii.h"
+#include "non-ascii.h"
-#include "curl_rawstr.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
 /*

lib/curl_ntlm_core.h

@@ -22,7 +22,7 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #if defined(USE_NTLM) && !defined(USE_WINDOWS_SSPI)
 

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 "urldata.h"
-#include "curl_non_ascii.h"
+#include "non-ascii.h"
-#include "curl_sendf.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"

lib/curl_ntlm_msgs.h

@@ -22,7 +22,7 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #ifdef USE_NTLM
 

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 "urldata.h"
-#include "curl_sendf.h"
+#include "sendf.h"
-#include "curl_select.h"
+#include "select.h"
 #include "curl_ntlm_wb.h"
-#include "curl_url.h"
+#include "url.h"
-#include "curl_strerror.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

lib/curl_ntlm_wb.h

@@ -22,7 +22,7 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #if defined(USE_NTLM) && defined(NTLM_WB_ENABLED)
 

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

lib/curl_rtmp.c

@@ -20,15 +20,15 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #ifdef USE_LIBRTMP
 
-#include "curl_urldata.h"
+#include "urldata.h"
-#include "curl_nonblock.h" /* for curlx_nonblock */
+#include "nonblock.h" /* for curlx_nonblock */
-#include "curl_progress.h" /* for Curl_pgrsSetUploadSize */
+#include "progress.h" /* for Curl_pgrsSetUploadSize */
-#include "curl_transfer.h"
+#include "transfer.h"
-#include "curl_warnless.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)

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

lib/curl_sasl.h

@@ -22,7 +22,7 @@
  *
  ***************************************************************************/
 
-#include "curl_pingpong.h"
+#include "pingpong.h"
 
 /* Authentication mechanism flags */
 #define SASL_MECH_LOGIN         0x0001

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,10 +24,20 @@
 
 /*
  * 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
@@ -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 "sslgen.h"
-#include "curl_sendf.h"
+#include "sendf.h"
-#include "curl_connect.h" /* for the connect timeout */
+#include "connect.h" /* for the connect timeout */
-#include "curl_strerror.h"
+#include "strerror.h"
-#include "curl_select.h" /* for the socket readyness */
+#include "select.h" /* for the socket readyness */
-#include "curl_inet_pton.h" /* for IP addr SNI check */
+#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__)

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"

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);

lib/curl_sspi.h

@@ -22,7 +22,7 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #ifdef USE_WINDOWS_SSPI
 

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)
 

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

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"
+#include "strequal.h"
-/* "curl_strequal.h" provides the strequal protos */
+/* "strequal.h" provides the strequal protos */
 
-#include "curl_strtoofft.h"
+#include "strtoofft.h"
-/* "curl_strtoofft.h" provides this function: curlx_strtoofft(), returns a
+/* "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
+  "timeval.h" sets up a 'struct timeval' even for platforms that otherwise
-   otherwise don't have one and has protos for these functions:
+  don't have one and has protos for these functions:
 
   curlx_tvnow()
   curlx_tvdiff()
   curlx_tvdiff_secs()
 */
 
-#include "curl_nonblock.h"
+#include "nonblock.h"
-/* "curl_nonblock.h" provides curlx_nonblock() */
+/* "nonblock.h" provides curlx_nonblock() */
 
-#include "curl_warnless.h"
+#include "warnless.h"
-/* "curl_warnless.h" provides functions:
+/* "warnless.h" provides functions:
 
   curlx_ultous()
   curlx_ultouc()

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 "urldata.h"
-#include "curl_sendf.h"
+#include "sendf.h"
-#include "curl_inet_pton.h"
+#include "inet_pton.h"
-#include "curl_cyassl.h"
+#include "cyassl.h"
-#include "curl_sslgen.h"
+#include "sslgen.h"
-#include "curl_parsedate.h"
+#include "parsedate.h"
-#include "curl_connect.h" /* for the connect timeout */
+#include "connect.h" /* for the connect timeout */
-#include "curl_select.h"
+#include "select.h"
-#include "curl_rawstr.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>
 

lib/cyassl.h

@@ -21,7 +21,7 @@
  * KIND, either express or implied.
  *
  ***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
 
 #ifdef USE_CYASSL
 

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 "transfer.h"
-#include "curl_sendf.h"
+#include "sendf.h"
 
-#include "curl_progress.h"
+#include "progress.h"
-#include "curl_strequal.h"
+#include "strequal.h"
-#include "curl_dict.h"
+#include "dict.h"
-#include "curl_rawstr.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.

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 "strequal.h"
-#include "curl_urldata.h"
+#include "urldata.h"
 #include <curl/curl.h>
-#include "curl_transfer.h"
+#include "transfer.h"
-#include "curl_sslgen.h"
+#include "sslgen.h"
-#include "curl_url.h"
+#include "url.h"
-#include "curl_getinfo.h"
+#include "getinfo.h"
-#include "curl_hostip.h"
+#include "hostip.h"
-#include "curl_share.h"
+#include "share.h"
-#include "curl_strdup.h"
+#include "strdup.h"
 #include "curl_memory.h"
-#include "curl_progress.h"
+#include "progress.h"
-#include "curl_easyif.h"
+#include "easyif.h"
-#include "curl_select.h"
+#include "select.h"
-#include "curl_sendf.h" /* for failf function prototype */
+#include "sendf.h" /* for failf function prototype */
 #include "curl_ntlm.h"
-#include "curl_connect.h" /* for Curl_getconnectinfo */
+#include "connect.h" /* for Curl_getconnectinfo */
-#include "curl_slist.h"
+#include "slist.h"
-#include "curl_amigaos.h"
+#include "amigaos.h"
 #include "curl_rand.h"
-#include "curl_non_ascii.h"
+#include "non-ascii.h"
-#include "curl_warnless.h"
+#include "warnless.h"
-#include "curl_conncache.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() */

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);
 

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 "urldata.h"
-#include "curl_warnless.h"
+#include "warnless.h"
-#include "curl_non_ascii.h"
+#include "non-ascii.h"
-#include "curl_escape.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.

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 "strtoofft.h"
-#include "curl_urldata.h"
+#include "urldata.h"
 #include <curl/curl.h>
-#include "curl_progress.h"
+#include "progress.h"
-#include "curl_sendf.h"
+#include "sendf.h"
-#include "curl_escape.h"
+#include "escape.h"
-#include "curl_file.h"
+#include "file.h"
-#include "curl_speedcheck.h"
+#include "speedcheck.h"
-#include "curl_getinfo.h"
+#include "getinfo.h"
-#include "curl_transfer.h"
+#include "transfer.h"
-#include "curl_url.h"
+#include "url.h"
 #include "curl_memory.h"
-#include "curl_parsedate.h" /* for the week day and month names */
+#include "parsedate.h" /* for the week day and month names */
-#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"
 
 #if defined(WIN32) || defined(MSDOS) || defined(__EMX__) || \
   defined(__SYMBIAN32__)

lib/fileinfo.c

@@ -20,17 +20,17 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
-#include "curl_strdup.h"
+#include "strdup.h"
-#include "curl_fileinfo.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)
 {

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 "urldata.h" /* for struct SessionHandle */
-#include "curl_formdata.h"
+#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
+ * Curl_formclean() is used from http.c, this cleans a built FormData linked
- * linked list
+ * list
  */
 void Curl_formclean(struct FormData **form_ptr)
 {

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 "urldata.h"
-#include "curl_sendf.h"
+#include "sendf.h"
-#include "curl_if2ip.h"
+#include "if2ip.h"
-#include "curl_hostip.h"
+#include "hostip.h"
-#include "curl_progress.h"
+#include "progress.h"
-#include "curl_transfer.h"
+#include "transfer.h"
-#include "curl_escape.h"
+#include "escape.h"
-#include "curl_http.h" /* for HTTP proxy tunnel stuff */
+#include "http.h" /* for HTTP proxy tunnel stuff */
-#include "curl_socks.h"
+#include "socks.h"
-#include "curl_ftp.h"
+#include "ftp.h"
-#include "curl_fileinfo.h"
+#include "fileinfo.h"
-#include "curl_ftplistparser.h"
+#include "ftplistparser.h"
 
 #if defined(HAVE_KRB4) || defined(HAVE_GSSAPI)
-#include "curl_krb4.h"
+#include "krb4.h"
 #endif
 
-#include "curl_strtoofft.h"
+#include "strtoofft.h"
-#include "curl_strequal.h"
+#include "strequal.h"
-#include "curl_sslgen.h"
+#include "sslgen.h"
-#include "curl_connect.h"
+#include "connect.h"
-#include "curl_strerror.h"
+#include "strerror.h"
-#include "curl_inet_ntop.h"
+#include "inet_ntop.h"
-#include "curl_inet_pton.h"
+#include "inet_pton.h"
-#include "curl_select.h"
+#include "select.h"
-#include "curl_parsedate.h" /* for the week day and month names */
+#include "parsedate.h" /* for the week day and month names */
-#include "curl_sockaddr.h" /* required for Curl_sockaddr_storage */
+#include "sockaddr.h" /* required for Curl_sockaddr_storage */
-#include "curl_multiif.h"
+#include "multiif.h"
-#include "curl_url.h"
+#include "url.h"
-#include "curl_rawstr.h"
+#include "rawstr.h"
-#include "curl_speedcheck.h"
+#include "speedcheck.h"
-#include "curl_warnless.h"
+#include "warnless.h"
-#include "curl_http_proxy.h"
+#include "http_proxy.h"
-#include "curl_non_ascii.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)
 {

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 */

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 "urldata.h"
-#include "curl_fileinfo.h"
+#include "fileinfo.h"
-#include "curl_llist.h"
+#include "llist.h"
-#include "curl_strtoofft.h"
+#include "strtoofft.h"
-#include "curl_rawstr.h"
+#include "rawstr.h"
-#include "curl_ftp.h"
+#include "ftp.h"
-#include "curl_ftplistparser.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

lib/ftplistparser.h

@@ -21,7 +21,7 @@
  * KIND, either express or implied.
  *
  ***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
 
 #ifndef CURL_DISABLE_FTP
 

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)

lib/getinfo.c

@@ -20,20 +20,20 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #include <curl/curl.h>
 
-#include "curl_urldata.h"
+#include "urldata.h"
-#include "curl_getinfo.h"
+#include "getinfo.h"
 
 #include "curl_memory.h"
-#include "curl_sslgen.h"
+#include "sslgen.h"
-#include "curl_connect.h" /* Curl_getconnectinfo() */
+#include "connect.h" /* Curl_getconnectinfo() */
-#include "curl_progress.h"
+#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

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 "transfer.h"
-#include "curl_sendf.h"
+#include "sendf.h"
 
-#include "curl_progress.h"
+#include "progress.h"
-#include "curl_strequal.h"
+#include "strequal.h"
-#include "curl_gopher.h"
+#include "gopher.h"
-#include "curl_rawstr.h"
+#include "rawstr.h"
-#include "curl_select.h"
+#include "select.h"
-#include "curl_url.h"
+#include "url.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"
 
 /*
  * Forward declarations.

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 "urldata.h"
-#include "curl_sendf.h"
+#include "sendf.h"
-#include "curl_inet_pton.h"
+#include "inet_pton.h"
-#include "curl_gtls.h"
+#include "gtls.h"
-#include "curl_sslgen.h"
+#include "sslgen.h"
-#include "curl_parsedate.h"
+#include "parsedate.h"
-#include "curl_connect.h" /* for the connect timeout */
+#include "connect.h" /* for the connect timeout */
-#include "curl_select.h"
+#include "select.h"
-#include "curl_rawstr.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.

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);

lib/hash.c

@@ -20,17 +20,17 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
-#include "curl_hash.h"
+#include "hash.h"
-#include "curl_llist.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)

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,

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.

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 "urldata.h"
-#include "curl_sendf.h"
+#include "sendf.h"
-#include "curl_hostip.h"
+#include "hostip.h"
-#include "curl_hash.h"
+#include "hash.h"
-#include "curl_share.h"
+#include "share.h"
-#include "curl_strerror.h"
+#include "strerror.h"
-#include "curl_url.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

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 "hostcheck.h"
-#include "curl_rawstr.h"
+#include "rawstr.h"
 
 /*
  * Match a hostname against a wildcard pattern.

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 "urldata.h"
-#include "curl_sendf.h"
+#include "sendf.h"
-#include "curl_hostip.h"
+#include "hostip.h"
-#include "curl_hash.h"
+#include "hash.h"
-#include "curl_share.h"
+#include "share.h"
-#include "curl_strerror.h"
+#include "strerror.h"
-#include "curl_url.h"
+#include "url.h"
-#include "curl_inet_ntop.h"
+#include "inet_ntop.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"
 
 #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
+ * hostip.c   - method-independent resolver functions and utility functions
- * curl_hostasyn.c - functions for asynchronous name resolves
+ * hostasyn.c - functions for asynchronous name resolves
- * curl_hostsyn.c  - functions for synchronous name resolves
+ * hostsyn.c  - functions for synchronous name resolves
- * curl_hostip4.c  - ipv4-specific functions
+ * hostip4.c  - ipv4-specific functions
- * curl_hostip6.c  - ipv6-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
+ * asyn-ares.c   - functions for ares-using name resolves
- * curl_asyn_thread.c - functions for threaded 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
+ * The 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.
+ * CURLRES_* defines based on the config*.h and setup.h defines.
  */
 
 /* These two symbols are for the global DNS cache */

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 "setup.h"
-#include "curl_hash.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.

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 "urldata.h"
-#include "curl_sendf.h"
+#include "sendf.h"
-#include "curl_hostip.h"
+#include "hostip.h"
-#include "curl_hash.h"
+#include "hash.h"
-#include "curl_share.h"
+#include "share.h"
-#include "curl_strerror.h"
+#include "strerror.h"
-#include "curl_url.h"
+#include "url.h"
-#include "curl_inet_pton.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

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 "urldata.h"
-#include "curl_sendf.h"
+#include "sendf.h"
-#include "curl_hostip.h"
+#include "hostip.h"
-#include "curl_hash.h"
+#include "hash.h"
-#include "curl_share.h"
+#include "share.h"
-#include "curl_strerror.h"
+#include "strerror.h"
-#include "curl_url.h"
+#include "url.h"
-#include "curl_inet_pton.h"
+#include "inet_pton.h"
-#include "curl_connect.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
+ * family otherwise present in memdebug.c. I put these ones here since they
- * they require a bunch of structs I didn't want to include there.
+ * require a bunch of structs I didn't want to include in memdebug.c
  */
 
 /*