Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

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 13606bb 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
  • Loading branch information...
commit 4a5aa6682daeea7cd7cbbb47ce3e1c310e9261c2 1 parent e0ba958
@yangtse yangtse authored
Showing with 1,590 additions and 1,881 deletions.
  1. +2 −2 CMakeLists.txt
  2. +1 −1  buildconf
  3. +1 −1  configure.ac
  4. +1 −1  docs/INSTALL
  5. +53 −54 docs/INTERNALS
  6. +2 −2 docs/TODO
  7. +1 −1  include/curl/curlrules.h
  8. +22 −22 lib/CMakeLists.txt
  9. +11 −42 lib/Makefile.am
  10. +36 −210 lib/Makefile.inc
  11. +2 −2 lib/Makefile.netware
  12. +81 −81 lib/Makefile.vc6
  13. +1 −1  lib/README.curlx
  14. +12 −12 lib/README.hostip
  15. +2 −2 lib/{curl_amigaos.c → amigaos.c}
  16. +1 −1  lib/{curl_amigaos.h → amigaos.h}
  17. 0  lib/{curl_arpa_telnet.h → arpa_telnet.h}
  18. +15 −15 lib/{curl_asyn_ares.c → asyn-ares.c}
  19. +12 −12 lib/{curl_asyn_thread.c → asyn-thread.c}
  20. +4 −4 lib/{curl_asyn.h → asyn.h}
  21. +28 −30 lib/{curl_axtls.c → axtls.c}
  22. +1 −1  lib/{curl_axtls.h → axtls.h}
  23. +7 −7 lib/{curl_base64.c → base64.c}
  24. +9 −9 lib/{curl_bundles.c → bundles.c}
  25. 0  lib/{curl_bundles.h → bundles.h}
  26. +10 −10 lib/{curl_conncache.c → conncache.c}
  27. 0  lib/{curl_conncache.h → conncache.h}
  28. +16 −16 lib/{curl_connect.c → connect.c}
  29. +3 −3 lib/{curl_connect.h → connect.h}
  30. +5 −5 lib/{curl_content_encoding.c → content_encoding.c}
  31. +1 −1  lib/{curl_content_encoding.h → content_encoding.h}
  32. +10 −10 lib/{curl_cookie.c → cookie.c}
  33. +1 −1  lib/{curl_cookie.h → cookie.h}
  34. +9 −9 lib/curl_addrinfo.c
  35. +1 −1  lib/curl_addrinfo.h
  36. +10 −11 lib/curl_darwinssl.c
  37. +1 −1  lib/curl_darwinssl.h
  38. +2 −2 lib/curl_fnmatch.c
  39. +1 −1  lib/curl_gethostname.c
  40. +2 −2 lib/curl_gssapi.c
  41. +2 −2 lib/curl_gssapi.h
  42. +1 −1  lib/curl_md4.h
  43. +2 −2 lib/curl_memrchr.c
  44. +1 −1  lib/curl_memrchr.h
  45. +2 −2 lib/curl_multibyte.c
  46. +1 −1  lib/curl_multibyte.h
  47. +7 −7 lib/curl_ntlm.c
  48. +1 −1  lib/curl_ntlm.h
  49. +6 −6 lib/curl_ntlm_core.c
  50. +1 −1  lib/curl_ntlm_core.h
  51. +8 −8 lib/curl_ntlm_msgs.c
  52. +1 −1  lib/curl_ntlm_msgs.h
  53. +7 −7 lib/curl_ntlm_wb.c
  54. +1 −1  lib/curl_ntlm_wb.h
  55. +2 −2 lib/curl_rand.c
  56. +7 −7 lib/curl_rtmp.c
  57. +4 −4 lib/curl_sasl.c
  58. +1 −1  lib/curl_sasl.h
  59. +21 −11 lib/curl_schannel.c
  60. +2 −2 lib/curl_schannel.h
  61. +2 −2 lib/curl_sspi.c
  62. +1 −1  lib/curl_sspi.h
  63. +2 −2 lib/curl_threads.c
  64. +1 −1  lib/curl_threads.h
  65. +11 −11 lib/curlx.h
  66. +13 −13 lib/{curl_cyassl.c → cyassl.c}
  67. +1 −1  lib/{curl_cyassl.h → cyassl.h}
  68. +9 −9 lib/{curl_dict.c → dict.c}
  69. 0  lib/{curl_dict.h → dict.h}
  70. +22 −22 lib/{curl_easy.c → easy.c}
  71. +2 −2 lib/{curl_easyif.h → easyif.h}
  72. +7 −7 lib/{curl_escape.c → escape.c}
  73. 0  lib/{curl_escape.h → escape.h}
  74. +14 −14 lib/{curl_file.c → file.c}
  75. 0  lib/{curl_file.h → file.h}
  76. +4 −4 lib/{curl_fileinfo.c → fileinfo.c}
  77. 0  lib/{curl_fileinfo.h → fileinfo.h}
  78. +9 −9 lib/{curl_formdata.c → formdata.c}
  79. 0  lib/{curl_formdata.h → formdata.h}
  80. +35 −35 lib/{curl_ftp.c → ftp.c}
  81. +4 −4 lib/{curl_ftp.h → ftp.h}
  82. +9 −9 lib/{curl_ftplistparser.c → ftplistparser.c}
  83. +1 −1  lib/{curl_ftplistparser.h → ftplistparser.h}
  84. +2 −2 lib/{curl_getenv.c → getenv.c}
  85. +7 −7 lib/{curl_getinfo.c → getinfo.c}
  86. 0  lib/{curl_getinfo.h → getinfo.h}
  87. +12 −12 lib/{curl_gopher.c → gopher.c}
  88. 0  lib/{curl_gopher.h → gopher.h}
  89. +14 −14 lib/{curl_gtls.c → gtls.c}
  90. +2 −2 lib/{curl_gtls.h → gtls.h}
  91. +4 −4 lib/{curl_hash.c → hash.c}
  92. +2 −2 lib/{curl_hash.h → hash.h}
  93. +2 −2 lib/{curl_hmac.c → hmac.c}
  94. +9 −9 lib/{curl_hostasyn.c → hostasyn.c}
  95. +3 −3 lib/{curl_hostcheck.c → hostcheck.c}
  96. 0  lib/{curl_hostcheck.h → hostcheck.h}
  97. +25 −25 lib/{curl_hostip.c → hostip.c}
  98. +5 −5 lib/{curl_hostip.h → hostip.h}
  99. +10 −10 lib/{curl_hostip4.c → hostip4.c}
  100. +14 −14 lib/{curl_hostip6.c → hostip6.c}
  101. +9 −9 lib/{curl_hostsyn.c → hostsyn.c}
  102. +34 −34 lib/{curl_http.c → http.c}
  103. +3 −3 lib/{curl_http.h → http.h}
  104. +9 −9 lib/{curl_http_chunks.c → http_chunks.c}
  105. 0  lib/{curl_http_chunks.h → http_chunks.h}
  106. +11 −11 lib/{curl_http_digest.c → http_digest.c}
  107. +1 −1  lib/{curl_http_digest.h → http_digest.h}
  108. +7 −7 lib/{curl_http_negotiate.c → http_negotiate.c}
  109. 0  lib/{curl_http_negotiate.h → http_negotiate.h}
  110. +7 −7 lib/{curl_http_negotiate_sspi.c → http_negotiate_sspi.c}
  111. +13 −13 lib/{curl_http_proxy.c → http_proxy.c}
  112. 0  lib/{curl_http_proxy.h → http_proxy.h}
  113. +2 −2 lib/{curl_idn_win32.c → idn_win32.c}
  114. +5 −5 lib/{curl_if2ip.c → if2ip.c}
  115. +1 −1  lib/{curl_if2ip.h → if2ip.h}
  116. +25 −25 lib/{curl_imap.c → imap.c}
  117. +3 −3 lib/{curl_imap.h → imap.h}
  118. +2 −2 lib/{curl_inet_ntop.c → inet_ntop.c}
  119. +1 −1  lib/{curl_inet_ntop.h → inet_ntop.h}
  120. +2 −2 lib/{curl_inet_pton.c → inet_pton.c}
  121. +1 −1  lib/{curl_inet_pton.h → inet_pton.h}
  122. +7 −7 lib/{curl_krb4.c → krb4.c}
  123. 0  lib/{curl_krb4.h → krb4.h}
  124. +9 −9 lib/{curl_krb5.c → krb5.c}
  125. +18 −18 lib/{curl_ldap.c → ldap.c}
  126. +3 −3 lib/{curl_llist.c → llist.c}
  127. +1 −1  lib/{curl_llist.h → llist.h}
  128. +2 −2 lib/{curl_md4.c → md4.c}
  129. +5 −5 lib/{curl_md5.c → md5.c}
  130. +3 −3 lib/{curl_memdebug.c → memdebug.c}
  131. +1 −1  lib/{curl_memdebug.h → memdebug.h}
  132. +4 −4 lib/{curl_mprintf.c → mprintf.c}
  133. +19 −19 lib/{curl_multi.c → multi.c}
  134. +2 −2 lib/{curl_multiif.h → multiif.h}
  135. +6 −6 lib/{curl_netrc.c → netrc.c}
  136. 0  lib/{curl_netrc.h → netrc.h}
  137. +9 −9 lib/{curl_non_ascii.c → non-ascii.c}
  138. +2 −2 lib/{curl_non_ascii.h → non-ascii.h}
  139. +2 −2 lib/{curl_nonblock.c → nonblock.c}
  140. 0  lib/{curl_nonblock.h → nonblock.h}
  141. +16 −16 lib/{curl_nss.c → nss.c}
  142. +4 −5 lib/{curl_nssg.h → nssg.h}
  143. +2 −2 lib/{curl_nwlib.c → nwlib.c}
  144. +1 −1  lib/{curl_nwos.c → nwos.c}
  145. +14 −14 lib/{curl_openldap.c → openldap.c}
  146. +4 −4 lib/{curl_parsedate.c → parsedate.c}
  147. 0  lib/{curl_parsedate.h → parsedate.h}
  148. +11 −11 lib/{curl_pingpong.c → pingpong.c}
  149. +2 −2 lib/{curl_pingpong.h → pingpong.h}
  150. +13 −13 lib/{curl_polarssl.c → polarssl.c}
  151. +1 −1  lib/{curl_polarssl.h → polarssl.h}
  152. +26 −26 lib/{curl_pop3.c → pop3.c}
  153. +2 −2 lib/{curl_pop3.h → pop3.h}
  154. +4 −4 lib/{curl_progress.c → progress.c}
  155. +1 −1  lib/{curl_progress.h → progress.h}
  156. +8 −8 lib/{curl_qssl.c → qssl.c}
  157. +4 −5 lib/{curl_qssl.h → qssl.h}
  158. +2 −2 lib/{curl_rawstr.c → rawstr.c}
  159. 0  lib/{curl_rawstr.h → rawstr.h}
  160. +18 −18 lib/{curl_rtsp.c → rtsp.c}
  161. 0  lib/{curl_rtsp.h → rtsp.h}
  162. +8 −8 lib/{curl_security.c → security.c}
  163. +5 −5 lib/{curl_select.c → select.c}
  164. +1 −1  lib/{curl_select.h → select.h}
  165. +13 −13 lib/{curl_sendf.c → sendf.c}
  166. +1 −1  lib/{curl_sendf.h → sendf.h}
  167. +3 −1 lib/{curl_setup.h → setup.h}
  168. 0  lib/{curl_setup_once.h → setup_once.h}
  169. +5 −5 lib/{curl_share.c → share.c}
  170. +3 −3 lib/{curl_share.h → share.h}
  171. +3 −3 lib/{curl_slist.c → slist.c}
  172. 0  lib/{curl_slist.h → slist.h}
  173. +26 −26 lib/{curl_smtp.c → smtp.c}
  174. +3 −3 lib/{curl_smtp.h → smtp.h}
  175. +1 −1  lib/{curl_sockaddr.h → sockaddr.h}
  176. +9 −9 lib/{curl_socks.c → socks.c}
  177. +1 −1  lib/{curl_socks.h → socks.h}
  178. +8 −8 lib/{curl_socks_gssapi.c → socks_gssapi.c}
  179. +9 −9 lib/{curl_socks_sspi.c → socks_sspi.c}
  180. +5 −5 lib/{curl_speedcheck.c → speedcheck.c}
  181. +2 −2 lib/{curl_speedcheck.h → speedcheck.h}
  182. +2 −2 lib/{curl_splay.c → splay.c}
  183. +1 −1  lib/{curl_splay.h → splay.h}
  184. +30 −30 lib/{curl_ssh.c → ssh.c}
  185. +3 −3 lib/{curl_ssh.h → ssh.h}
  186. +16 −16 lib/{curl_sslgen.c → sslgen.c}
  187. +1 −1  lib/{curl_sslgen.h → sslgen.h}
  188. +18 −18 lib/{curl_ssluse.c → ssluse.c}
  189. +4 −5 lib/{curl_ssluse.h → ssluse.h}
  190. +2 −2 lib/{curl_strdup.c → strdup.c}
  191. +1 −1  lib/{curl_strdup.h → strdup.h}
  192. +2 −2 lib/{curl_strequal.c → strequal.c}
  193. 0  lib/{curl_strequal.h → strequal.h}
  194. +3 −3 lib/{curl_strerror.c → strerror.c}
  195. +1 −1  lib/{curl_strerror.h → strerror.h}
  196. +2 −2 lib/{curl_strtok.c → strtok.c}
  197. +1 −1  lib/{curl_strtok.h → strtok.h}
  198. +2 −2 lib/{curl_strtoofft.c → strtoofft.c}
  199. +1 −1  lib/{curl_strtoofft.h → strtoofft.h}
  200. +13 −13 lib/{curl_telnet.c → telnet.c}
  201. 0  lib/{curl_telnet.h → telnet.h}
  202. +16 −16 lib/{curl_tftp.c → tftp.c}
  203. 0  lib/{curl_tftp.h → tftp.h}
  204. +1 −1  lib/{curl_timeval.c → timeval.c}
  205. +1 −1  lib/{curl_timeval.h → timeval.h}
  206. +28 −28 lib/{curl_transfer.c → transfer.c}
  207. 0  lib/{curl_transfer.h → transfer.h}
  208. +49 −49 lib/{curl_url.c → url.c}
  209. +3 −3 lib/{curl_url.h → url.h}
  210. +26 −26 lib/{curl_urldata.h → urldata.h}
  211. +3 −3 lib/{curl_version.c → version.c}
  212. +2 −2 lib/{curl_warnless.c → warnless.c}
  213. 0  lib/{curl_warnless.h → warnless.h}
  214. +5 −5 lib/{curl_wildcard.c → wildcard.c}
  215. 0  lib/{curl_wildcard.h → wildcard.h}
  216. +4 −4 m4/curl-reentrant.m4
  217. +5 −5 packages/OS400/ccsidcurl.c
  218. +7 −7 packages/OS400/make-lib.sh
  219. +2 −2 packages/OS400/os400sys.c
  220. +1 −2  packages/Symbian/group/curl.mmp
  221. +18 −107 packages/Symbian/group/libcurl.mmp
  222. +2 −2 src/CMakeLists.txt
  223. +1 −1  src/Makefile.Watcom
  224. +4 −5 src/Makefile.inc
  225. +19 −19 src/Makefile.vc6
  226. +1 −1  src/mkhelp.pl
  227. +1 −1  src/tool_binmode.c
  228. +1 −1  src/tool_bname.c
  229. +1 −1  src/tool_cb_dbg.c
  230. +2 −2 src/tool_cb_hdr.c
  231. +1 −1  src/tool_cb_prg.c
  232. +1 −1  src/tool_cb_rea.c
  233. +1 −1  src/tool_cb_see.c
  234. +1 −1  src/tool_cb_wrt.c
  235. +1 −1  src/tool_cfgable.c
  236. +1 −1  src/tool_convert.c
  237. +1 −1  src/tool_dirhie.c
  238. +1 −1  src/tool_doswin.c
  239. +1 −1  src/tool_easysrc.c
  240. +2 −2 src/tool_formparse.c
  241. +2 −2 src/tool_getparam.c
  242. +1 −1  src/tool_getpass.c
  243. +1 −1  src/tool_help.c
  244. +2 −2 src/tool_helpers.c
  245. +1 −1  src/tool_homedir.c
  246. +2 −2 src/tool_libinfo.c
  247. +1 −1  src/tool_main.c
  248. +2 −2 src/tool_metalink.c
  249. +1 −1  src/tool_mfiles.c
  250. +1 −1  src/tool_msgs.c
  251. +4 −4 src/tool_operate.c
  252. +2 −2 src/tool_operhlp.c
  253. +1 −1  src/tool_panykey.c
  254. +2 −2 src/tool_paramhlp.c
  255. +1 −1  src/tool_parsecfg.c
  256. +1 −1  src/tool_setopt.c
  257. +4 −4 src/tool_setup.h
  258. +1 −1  src/tool_sleep.c
  259. +1 −1  src/tool_urlglob.c
  260. +1 −1  src/tool_util.c
  261. +1 −1  src/tool_vms.c
  262. +1 −1  src/tool_writeenv.c
  263. +1 −1  src/tool_writeout.c
  264. +1 −1  src/tool_xattr.c
  265. +6 −6 src/vc6curlsrc.dsp
  266. +2 −2 tests/convsrctest.pl
  267. +1 −1  tests/libtest/CMakeLists.txt
  268. +1 −1  tests/libtest/Makefile.inc
  269. +1 −1  tests/libtest/chkhostname.c
  270. +1 −1  tests/libtest/first.c
  271. +2 −2 tests/libtest/lib1500.c
  272. +2 −2 tests/libtest/lib1501.c
  273. +2 −2 tests/libtest/lib1502.c
  274. +1 −1  tests/libtest/lib500.c
  275. +1 −1  tests/libtest/lib501.c
  276. +2 −2 tests/libtest/lib502.c
  277. +2 −2 tests/libtest/lib503.c
  278. +2 −2 tests/libtest/lib504.c
  279. +1 −1  tests/libtest/lib505.c
  280. +1 −1  tests/libtest/lib506.c
  281. +2 −2 tests/libtest/lib507.c
  282. +1 −1  tests/libtest/lib508.c
  283. +1 −1  tests/libtest/lib510.c
  284. +1 −1  tests/libtest/lib511.c
  285. +1 −1  tests/libtest/lib512.c
  286. +1 −1  tests/libtest/lib513.c
  287. +1 −1  tests/libtest/lib514.c
  288. +1 −1  tests/libtest/lib515.c
  289. +1 −1  tests/libtest/lib516.c
  290. +1 −1  tests/libtest/lib517.c
  291. +4 −4 tests/libtest/lib518.c
  292. +1 −1  tests/libtest/lib519.c
  293. +1 −1  tests/libtest/lib520.c
  294. +1 −1  tests/libtest/lib521.c
  295. +1 −1  tests/libtest/lib523.c
  296. +1 −1  tests/libtest/lib524.c
  297. +2 −2 tests/libtest/lib525.c
  298. +2 −2 tests/libtest/lib526.c
  299. +2 −2 tests/libtest/lib530.c
  300. +2 −2 tests/libtest/lib533.c
Sorry, we could not display the entire diff because too many files (371) changed.
View
4 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)
View
2  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!"
View
2  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
View
2  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.
View
107 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.
- This makes sure we stay absolutely platform independent.
+ All printf()-style functions use the supplied clones in lib/mprintf.c. This
+ 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
- main work then continues in lib/curl_url.c. The flow continues with a call to
+ It starts off in the lib/easy.c file by calling Curl_perform() and the main
+ 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
- names (it does then use the proper underlying method, which may vary
- between platforms and builds).
+ Curl_resolv() function in lib/hostip.c is used for looking up host names
+ (it does then use the proper underlying method, which may vary between
+ 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()
- and FTPS by Curl_ftp().
+ (ftp.c, http.c and dict.c). HTTPS is handled by Curl_http() and FTPS by
+ 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
- remote host and when they're ready to make the actual file transfer they
- call the Curl_Transfer() function (in lib/curl_transfer.c) to setup the
- transfer and returns.
+ lib/sendf.c) function to send printf-style formatted data to the remote
+ host and when they're ready to make the actual file transfer they call the
+ Curl_Transfer() function (in lib/transfer.c) to setup the transfer and
+ 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
- the entire file transfer.
+ Curl_perform() then calls Transfer() in lib/transfer.c that performs the
+ entire file transfer.
- During transfer, the progress functions in lib/curl_progress.c are called
- at a frequent interval (or at the user's choice, a specified callback
- might get called). The speedcheck functions in lib/curl_speedcheck.c are
- also used to verify that the transfer is as fast as required.
+ During transfer, the progress functions in lib/progress.c are called at a
+ frequent interval (or at the user's choice, a specified callback might get
+ called). The speedcheck functions in lib/speedcheck.c are also used to
+ 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
- multipart post functions.
+ code. There is a special file (lib/formdata.c) that offers all the multipart
+ post functions.
- base64-functions for user+password stuff (and more) is in (lib/curl_base64.c)
- and all functions for parsing and sending cookies in (lib/curl_cookie.c).
+ base64-functions for user+password stuff (and more) is in (lib/base64.c) and
+ 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
- transfer encoding.
+ http_chunks.c contains functions that understands HTTP 1.1 chunked transfer
+ 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
- more).
+ curl_getdate() in lib/parsedate.c is for HTTP date comparisons (and more).
- lib/curl_getenv.c offers curl_getenv() which is for reading environment
- variables in a neat platform independent way. That's used in the client,
- but also in lib/curl_url.c when checking the proxy environment variables.
- Note that contrary to the normal unix getenv(), this returns an allocated
- buffer that must be free()ed after use.
+ lib/getenv.c offers curl_getenv() which is for reading environment variables
+ in a neat platform independent way. That's used in the client, but also in
+ lib/url.c when checking the proxy environment variables. Note that contrary
+ to the normal unix getenv(), this returns an allocated buffer that must be
+ 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
- src/tool_writeout.c may be called to report about the operation. That
- function is using the curl_easy_getinfo() function to extract useful
- information from the curl session.
+ When the operation is done, the ourWriteOut() function in src/writeout.c may
+ be called to report about the operation. That function is using the
+ curl_easy_getinfo() function to extract useful information from the curl
+ 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.
- Functions such as malloc, free, fopen, fclose, etc that somehow deal with
- resources that might give us problems if we "leak" them. The functions in
- the memory tracking system do nothing fancy, they do their normal function
- and then log information about what they just did. The logged data can then
- be analyzed after a complete session,
+ The file lib/memdebug.c contains debug-versions of a few functions. Functions
+ such as malloc, free, fopen, fclose, etc that somehow deal with resources
+ that might give us problems if we "leak" them. The functions in the memdebug
+ system do nothing fancy, they do their normal function and then log
+ information about what they just did. The logged data can then be analyzed
+ 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
View
4 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
- headers from being output in NOBODY requests over ftp
+ #undef CURL_FTP_HTTPSTYLE_HEAD in lib/ftp.c to remove the HTTP-style headers
+ from being output in NOBODY requests over ftp
19.2 combine error codes
View
2  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.
*/
View
44 lib/CMakeLists.txt
@@ -18,18 +18,18 @@ if(MSVC)
endif()
# SET(CSOURCES
-# # curl_memdebug.c -not used
-# # curl_nwlib.c - Not used
-# # curl_strtok.c - specify later
-# # curl_strtoofft.c - specify later
+# # memdebug.c -not used
+# # nwlib.c - Not used
+# # strtok.c - specify later
+# # strtoofft.c - specify later
# )
# # if we have Kerberos 4, right now this is never on
# #OPTION(CURL_KRB4 "Use Kerberos 4" OFF)
# IF(CURL_KRB4)
# SET(CSOURCES ${CSOURCES}
-# curl_krb4.c
-# curl_security.c
+# krb4.c
+# security.c
# )
# ENDIF(CURL_KRB4)
@@ -37,33 +37,33 @@ endif()
# MARK_AS_ADVANCED(CURL_MALLOC_DEBUG)
# IF(CURL_MALLOC_DEBUG)
# SET(CSOURCES ${CSOURCES}
-# curl_memdebug.c
+# memdebug.c
# )
# ENDIF(CURL_MALLOC_DEBUG)
# # only build compat strtoofft if we need to
# IF(NOT HAVE_STRTOLL AND NOT HAVE__STRTOI64)
# SET(CSOURCES ${CSOURCES}
-# curl_strtoofft.c
+# strtoofft.c
# )
# ENDIF(NOT HAVE_STRTOLL AND NOT HAVE__STRTOI64)
if(HAVE_FEATURES_H)
set_source_files_properties(
- curl_cookie.c
- curl_easy.c
- curl_formdata.c
- curl_getenv.c
- curl_nonblock.c
- curl_hash.c
- curl_http.c
- curl_if2ip.c
- curl_mprintf.c
- curl_multi.c
- curl_sendf.c
- curl_telnet.c
- curl_transfer.c
- curl_url.c
+ cookie.c
+ easy.c
+ formdata.c
+ getenv.c
+ nonblock.c
+ hash.c
+ http.c
+ if2ip.c
+ mprintf.c
+ multi.c
+ sendf.c
+ telnet.c
+ transfer.c
+ url.c
COMPILE_FLAGS -D_BSD_SOURCE)
endif(HAVE_FEATURES_H)
View
53 lib/Makefile.am
@@ -5,7 +5,7 @@
# | (__| |_| | _ <| |___
# \___|\___/|_| \_\_____|
#
-# Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
+# Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
#
# This software is licensed as described in the file COPYING, which
# you should have received as part of this distribution. The terms
@@ -30,47 +30,16 @@ DOCS = README.encoding README.memoryleak README.ares README.curlx \
CMAKE_DIST = CMakeLists.txt curl_config.h.cmake
-EXTRA_DIST = \
- $(CMAKE_DIST) \
- $(DOCS) \
- $(DSP) \
- $(VCPROJ) \
- Makefile.Watcom \
- Makefile.b32 \
- Makefile.m32 \
- Makefile.netware \
- Makefile.vc6 \
- Makefile.vxworks \
- checksrc.pl \
- config-amigaos.h \
- config-dos.h \
- config-mac.h \
- config-os400.h \
- config-riscos.h \
- config-symbian.h \
- config-tpf.h \
- config-vms.h \
- config-vxworks.h \
- config-win32.h \
- config-win32ce.h \
- config-win32ce.h \
- curl_config.h.in \
- curl_nwlib.c \
- curl_nwos.c \
- firefox-db2pem.sh \
- libcurl.plist \
- libcurl.rc \
- makefile.amiga \
- makefile.dj \
- mk-ca-bundle.pl \
- mk-ca-bundle.vbs \
- msvcproj.foot \
- msvcproj.head \
- objnames-test08.sh \
- objnames-test10.sh \
- objnames.inc \
- setup-os400.h \
- vc6libcurl.dsw
+EXTRA_DIST = Makefile.b32 Makefile.m32 Makefile.vc6 $(DSP) \
+ vc6libcurl.dsw config-win32.h config-win32ce.h config-riscos.h \
+ config-mac.h curl_config.h.in makefile.dj config-dos.h libcurl.plist \
+ libcurl.rc config-amigaos.h makefile.amiga \
+ Makefile.netware nwlib.c nwos.c msvcproj.head msvcproj.foot \
+ config-win32ce.h config-os400.h setup-os400.h config-symbian.h \
+ Makefile.Watcom config-tpf.h $(DOCS) $(VCPROJ) mk-ca-bundle.pl \
+ mk-ca-bundle.vbs firefox-db2pem.sh $(CMAKE_DIST) config-vxworks.h \
+ Makefile.vxworks config-vms.h checksrc.pl objnames-test08.sh \
+ objnames-test10.sh objnames.inc
CLEANFILES = $(DSP) $(VCPROJ)
View
246 lib/Makefile.inc
@@ -7,214 +7,40 @@
# CSRC2 = file4.c file5.c file6.c
# CSOURCES = $(CSRC1) $(CSRC2)
-CSOURCES = \
- curl_amigaos.c \
- curl_asyn_ares.c \
- curl_asyn_thread.c \
- curl_axtls.c \
- curl_base64.c \
- curl_bundles.c \
- curl_conncache.c \
- curl_connect.c \
- curl_content_encoding.c \
- curl_cookie.c \
- curl_addrinfo.c \
- curl_darwinssl.c \
- curl_fnmatch.c \
- curl_gethostname.c \
- curl_gssapi.c \
- curl_memrchr.c \
- curl_multibyte.c \
- curl_ntlm.c \
- curl_ntlm_core.c \
- curl_ntlm_msgs.c \
- curl_ntlm_wb.c \
- curl_rand.c \
- curl_rtmp.c \
- curl_sasl.c \
- curl_schannel.c \
- curl_sspi.c \
- curl_threads.c \
- curl_cyassl.c \
- curl_dict.c \
- curl_easy.c \
- curl_escape.c \
- curl_file.c \
- curl_fileinfo.c \
- curl_formdata.c \
- curl_ftp.c \
- curl_ftplistparser.c \
- curl_getenv.c \
- curl_getinfo.c \
- curl_gopher.c \
- curl_gtls.c \
- curl_hash.c \
- curl_hmac.c \
- curl_hostasyn.c \
- curl_hostcheck.c \
- curl_hostip.c \
- curl_hostip4.c \
- curl_hostip6.c \
- curl_hostsyn.c \
- curl_http.c \
- curl_http_chunks.c \
- curl_http_digest.c \
- curl_http_negotiate.c \
- curl_http_negotiate_sspi.c \
- curl_http_proxy.c \
- curl_idn_win32.c \
- curl_if2ip.c \
- curl_imap.c \
- curl_inet_ntop.c \
- curl_inet_pton.c \
- curl_krb4.c \
- curl_krb5.c \
- curl_ldap.c \
- curl_llist.c \
- curl_md4.c \
- curl_md5.c \
- curl_memdebug.c \
- curl_mprintf.c \
- curl_multi.c \
- curl_netrc.c \
- curl_non_ascii.c \
- curl_nonblock.c \
- curl_nss.c \
- curl_openldap.c \
- curl_parsedate.c \
- curl_pingpong.c \
- curl_polarssl.c \
- curl_pop3.c \
- curl_progress.c \
- curl_qssl.c \
- curl_rawstr.c \
- curl_rtsp.c \
- curl_security.c \
- curl_select.c \
- curl_sendf.c \
- curl_share.c \
- curl_slist.c \
- curl_smtp.c \
- curl_socks.c \
- curl_socks_gssapi.c \
- curl_socks_sspi.c \
- curl_speedcheck.c \
- curl_splay.c \
- curl_ssh.c \
- curl_sslgen.c \
- curl_ssluse.c \
- curl_strdup.c \
- curl_strequal.c \
- curl_strerror.c \
- curl_strtok.c \
- curl_strtoofft.c \
- curl_telnet.c \
- curl_tftp.c \
- curl_timeval.c \
- curl_transfer.c \
- curl_url.c \
- curl_version.c \
- curl_warnless.c \
- curl_wildcard.c
-
-HHEADERS = \
- curl_addrinfo.h \
- curl_amigaos.h \
- curl_arpa_telnet.h \
- curl_asyn.h \
- curl_axtls.h \
- curl_base64.h \
- curl_bundles.h \
- curl_conncache.h \
- curl_connect.h \
- curl_content_encoding.h \
- curl_cookie.h \
- curl_cyassl.h \
- curl_darwinssl.h \
- curl_dict.h \
- curl_easyif.h \
- curl_escape.h \
- curl_file.h \
- curl_fileinfo.h \
- curl_fnmatch.h \
- curl_formdata.h \
- curl_ftp.h \
- curl_ftplistparser.h \
- curl_gethostname.h \
- curl_getinfo.h \
- curl_gopher.h \
- curl_gssapi.h \
- curl_gtls.h \
- curl_hash.h \
- curl_hmac.h \
- curl_hostcheck.h \
- curl_hostip.h \
- curl_http.h \
- curl_http_chunks.h \
- curl_http_digest.h \
- curl_http_negotiate.h \
- curl_http_proxy.h \
- curl_if2ip.h \
- curl_imap.h \
- curl_inet_ntop.h \
- curl_inet_pton.h \
- curl_krb4.h \
- curl_ldap.h \
- curl_llist.h \
- curl_md4.h \
- curl_md5.h \
- curl_memdebug.h \
- curl_memory.h \
- curl_memrchr.h \
- curl_multibyte.h \
- curl_multiif.h \
- curl_netrc.h \
- curl_non_ascii.h \
- curl_nonblock.h \
- curl_nssg.h \
- curl_ntlm.h \
- curl_ntlm_core.h \
- curl_ntlm_msgs.h \
- curl_ntlm_wb.h \
- curl_parsedate.h \
- curl_pingpong.h \
- curl_polarssl.h \
- curl_pop3.h \
- curl_progress.h \
- curl_qssl.h \
- curl_rand.h \
- curl_rawstr.h \
- curl_rtmp.h \
- curl_rtsp.h \
- curl_sasl.h \
- curl_schannel.h \
- curl_select.h \
- curl_sendf.h \
- curl_setup.h \
- curl_setup_once.h \
- curl_share.h \
- curl_slist.h \
- curl_smtp.h \
- curl_sockaddr.h \
- curl_socks.h \
- curl_speedcheck.h \
- curl_splay.h \
- curl_ssh.h \
- curl_sslgen.h \
- curl_ssluse.h \
- curl_sspi.h \
- curl_strdup.h \
- curl_strequal.h \
- curl_strerror.h \
- curl_strtok.h \
- curl_strtoofft.h \
- curl_telnet.h \
- curl_tftp.h \
- curl_threads.h \
- curl_timeval.h \
- curl_transfer.h \
- curl_url.h \
- curl_urldata.h \
- curl_wildcard.h \
- curlx.h
+CSOURCES = file.c timeval.c base64.c hostip.c progress.c formdata.c \
+ cookie.c http.c sendf.c ftp.c url.c dict.c if2ip.c speedcheck.c \
+ ldap.c ssluse.c version.c getenv.c escape.c mprintf.c telnet.c \
+ netrc.c getinfo.c transfer.c strequal.c easy.c security.c krb4.c \
+ curl_fnmatch.c fileinfo.c ftplistparser.c wildcard.c krb5.c \
+ memdebug.c http_chunks.c strtok.c connect.c llist.c hash.c multi.c \
+ content_encoding.c share.c http_digest.c md4.c md5.c curl_rand.c \
+ http_negotiate.c inet_pton.c strtoofft.c strerror.c amigaos.c \
+ hostasyn.c hostip4.c hostip6.c hostsyn.c inet_ntop.c parsedate.c \
+ select.c gtls.c sslgen.c tftp.c splay.c strdup.c socks.c ssh.c nss.c \
+ qssl.c rawstr.c curl_addrinfo.c socks_gssapi.c socks_sspi.c \
+ curl_sspi.c slist.c nonblock.c curl_memrchr.c imap.c pop3.c smtp.c \
+ pingpong.c rtsp.c curl_threads.c warnless.c hmac.c polarssl.c \
+ curl_rtmp.c openldap.c curl_gethostname.c gopher.c axtls.c \
+ idn_win32.c http_negotiate_sspi.c cyassl.c http_proxy.c non-ascii.c \
+ asyn-ares.c asyn-thread.c curl_gssapi.c curl_ntlm.c curl_ntlm_wb.c \
+ curl_ntlm_core.c curl_ntlm_msgs.c curl_sasl.c curl_schannel.c \
+ curl_multibyte.c curl_darwinssl.c hostcheck.c \
+ bundles.c conncache.c
+HHEADERS = arpa_telnet.h netrc.h file.h timeval.h qssl.h hostip.h \
+ progress.h formdata.h cookie.h http.h sendf.h ftp.h url.h dict.h \
+ if2ip.h speedcheck.h urldata.h curl_ldap.h ssluse.h escape.h telnet.h \
+ getinfo.h strequal.h krb4.h memdebug.h http_chunks.h curl_rand.h \
+ curl_fnmatch.h wildcard.h fileinfo.h ftplistparser.h strtok.h \
+ connect.h llist.h hash.h content_encoding.h share.h curl_md4.h \
+ curl_md5.h http_digest.h http_negotiate.h inet_pton.h amigaos.h \
+ strtoofft.h strerror.h inet_ntop.h curlx.h curl_memory.h setup.h \
+ transfer.h select.h easyif.h multiif.h parsedate.h sslgen.h gtls.h \
+ tftp.h sockaddr.h splay.h strdup.h setup_once.h socks.h ssh.h nssg.h \
+ curl_base64.h rawstr.h curl_addrinfo.h curl_sspi.h slist.h nonblock.h \
+ curl_memrchr.h imap.h pop3.h smtp.h pingpong.h rtsp.h curl_threads.h \
+ warnless.h curl_hmac.h polarssl.h curl_rtmp.h curl_gethostname.h \
+ gopher.h axtls.h cyassl.h http_proxy.h non-ascii.h asyn.h curl_ntlm.h \
+ curl_gssapi.h curl_ntlm_wb.h curl_ntlm_core.h curl_ntlm_msgs.h \
+ curl_sasl.h curl_schannel.h curl_multibyte.h curl_darwinssl.h \
+ hostcheck.h bundles.h conncache.h
View
4 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
View
162 lib/Makefile.vc6
@@ -5,7 +5,7 @@
# | (__| |_| | _ <| |___
# \___|\___/|_| \_\_____|
#
-# Copyright (C) 1999 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
+# Copyright (C) 1999 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
#
# This software is licensed as described in the file COPYING, which
# you should have received as part of this distribution. The terms
@@ -494,14 +494,14 @@ clean:
# A config was provided, so the library can be built.
#
X_OBJS= \
- $(DIROBJ)\curl_asyn_ares.obj \
- $(DIROBJ)\curl_asyn_thread.obj \
- $(DIROBJ)\curl_base64.obj \
- $(DIROBJ)\curl_bundles.obj \
- $(DIROBJ)\curl_conncache.obj \
- $(DIROBJ)\curl_connect.obj \
- $(DIROBJ)\curl_content_encoding.obj \
- $(DIROBJ)\curl_cookie.obj \
+ $(DIROBJ)\asyn-ares.obj \
+ $(DIROBJ)\asyn-thread.obj \
+ $(DIROBJ)\base64.obj \
+ $(DIROBJ)\bundles.obj \
+ $(DIROBJ)\conncache.obj \
+ $(DIROBJ)\connect.obj \
+ $(DIROBJ)\content_encoding.obj \
+ $(DIROBJ)\cookie.obj \
$(DIROBJ)\curl_addrinfo.obj \
$(DIROBJ)\curl_darwinssl.obj \
$(DIROBJ)\curl_fnmatch.obj \
@@ -518,78 +518,78 @@ X_OBJS= \
$(DIROBJ)\curl_schannel.obj \
$(DIROBJ)\curl_sspi.obj \
$(DIROBJ)\curl_threads.obj \
- $(DIROBJ)\curl_dict.obj \
- $(DIROBJ)\curl_easy.obj \
- $(DIROBJ)\curl_escape.obj \
- $(DIROBJ)\curl_file.obj \
- $(DIROBJ)\curl_fileinfo.obj \
- $(DIROBJ)\curl_formdata.obj \
- $(DIROBJ)\curl_ftp.obj \
- $(DIROBJ)\curl_ftplistparser.obj \
- $(DIROBJ)\curl_getenv.obj \
- $(DIROBJ)\curl_getinfo.obj \
- $(DIROBJ)\curl_gopher.obj \
- $(DIROBJ)\curl_gtls.obj \
- $(DIROBJ)\curl_hash.obj \
- $(DIROBJ)\curl_hmac.obj \
- $(DIROBJ)\curl_hostasyn.obj \
- $(DIROBJ)\curl_hostcheck.obj \
- $(DIROBJ)\curl_hostip.obj \
- $(DIROBJ)\curl_hostip4.obj \
- $(DIROBJ)\curl_hostip6.obj \
- $(DIROBJ)\curl_hostsyn.obj \
- $(DIROBJ)\curl_http.obj \
- $(DIROBJ)\curl_http_chunks.obj \
- $(DIROBJ)\curl_http_digest.obj \
- $(DIROBJ)\curl_http_negotiate.obj \
- $(DIROBJ)\curl_http_negotiate_sspi.obj \
- $(DIROBJ)\curl_http_proxy.obj \
- $(DIROBJ)\curl_if2ip.obj \
- $(DIROBJ)\curl_imap.obj \
- $(DIROBJ)\curl_inet_ntop.obj \
- $(DIROBJ)\curl_inet_pton.obj \
- $(DIROBJ)\curl_ldap.obj \
- $(DIROBJ)\curl_llist.obj \
- $(DIROBJ)\curl_md4.obj \
- $(DIROBJ)\curl_md5.obj \
- $(DIROBJ)\curl_memdebug.obj \
- $(DIROBJ)\curl_mprintf.obj \
- $(DIROBJ)\curl_multi.obj \
- $(DIROBJ)\curl_netrc.obj \
- $(DIROBJ)\curl_nonblock.obj \
- $(DIROBJ)\curl_openldap.obj \
- $(DIROBJ)\curl_parsedate.obj \
- $(DIROBJ)\curl_pingpong.obj \
- $(DIROBJ)\curl_polarssl.obj \
- $(DIROBJ)\curl_pop3.obj \
- $(DIROBJ)\curl_progress.obj \
- $(DIROBJ)\curl_rawstr.obj \
- $(DIROBJ)\curl_rtsp.obj \
- $(DIROBJ)\curl_select.obj \
- $(DIROBJ)\curl_sendf.obj \
- $(DIROBJ)\curl_share.obj \
- $(DIROBJ)\curl_slist.obj \
- $(DIROBJ)\curl_smtp.obj \
- $(DIROBJ)\curl_socks.obj \
- $(DIROBJ)\curl_socks_gssapi.obj \
- $(DIROBJ)\curl_socks_sspi.obj \
- $(DIROBJ)\curl_speedcheck.obj \
- $(DIROBJ)\curl_splay.obj \
- $(DIROBJ)\curl_ssh.obj \
- $(DIROBJ)\curl_sslgen.obj \
- $(DIROBJ)\curl_ssluse.obj \
- $(DIROBJ)\curl_strequal.obj \
- $(DIROBJ)\curl_strerror.obj \
- $(DIROBJ)\curl_strtok.obj \
- $(DIROBJ)\curl_strtoofft.obj \
- $(DIROBJ)\curl_telnet.obj \
- $(DIROBJ)\curl_tftp.obj \
- $(DIROBJ)\curl_timeval.obj \
- $(DIROBJ)\curl_transfer.obj \
- $(DIROBJ)\curl_url.obj \
- $(DIROBJ)\curl_version.obj \
- $(DIROBJ)\curl_warnless.obj \
- $(DIROBJ)\curl_wildcard.obj \
+ $(DIROBJ)\dict.obj \
+ $(DIROBJ)\easy.obj \
+ $(DIROBJ)\escape.obj \
+ $(DIROBJ)\file.obj \
+ $(DIROBJ)\fileinfo.obj \
+ $(DIROBJ)\formdata.obj \
+ $(DIROBJ)\ftp.obj \
+ $(DIROBJ)\ftplistparser.obj \
+ $(DIROBJ)\getenv.obj \
+ $(DIROBJ)\getinfo.obj \
+ $(DIROBJ)\gopher.obj \
+ $(DIROBJ)\gtls.obj \
+ $(DIROBJ)\hash.obj \
+ $(DIROBJ)\hmac.obj \
+ $(DIROBJ)\hostasyn.obj \
+ $(DIROBJ)\hostcheck.obj \
+ $(DIROBJ)\hostip.obj \
+ $(DIROBJ)\hostip4.obj \
+ $(DIROBJ)\hostip6.obj \
+ $(DIROBJ)\hostsyn.obj \
+ $(DIROBJ)\http.obj \
+ $(DIROBJ)\http_chunks.obj \
+ $(DIROBJ)\http_digest.obj \
+ $(DIROBJ)\http_negotiate.obj \
+ $(DIROBJ)\http_negotiate_sspi.obj \
+ $(DIROBJ)\http_proxy.obj \
+ $(DIROBJ)\if2ip.obj \
+ $(DIROBJ)\imap.obj \
+ $(DIROBJ)\inet_ntop.obj \
+ $(DIROBJ)\inet_pton.obj \
+ $(DIROBJ)\ldap.obj \
+ $(DIROBJ)\llist.obj \
+ $(DIROBJ)\md4.obj \
+ $(DIROBJ)\md5.obj \
+ $(DIROBJ)\memdebug.obj \
+ $(DIROBJ)\mprintf.obj \
+ $(DIROBJ)\multi.obj \
+ $(DIROBJ)\netrc.obj \
+ $(DIROBJ)\nonblock.obj \
+ $(DIROBJ)\openldap.obj \
+ $(DIROBJ)\parsedate.obj \
+ $(DIROBJ)\pingpong.obj \
+ $(DIROBJ)\polarssl.obj \
+ $(DIROBJ)\pop3.obj \
+ $(DIROBJ)\progress.obj \
+ $(DIROBJ)\rawstr.obj \
+ $(DIROBJ)\rtsp.obj \
+ $(DIROBJ)\select.obj \
+ $(DIROBJ)\sendf.obj \
+ $(DIROBJ)\share.obj \
+ $(DIROBJ)\slist.obj \
+ $(DIROBJ)\smtp.obj \
+ $(DIROBJ)\socks.obj \
+ $(DIROBJ)\socks_gssapi.obj \
+ $(DIROBJ)\socks_sspi.obj \
+ $(DIROBJ)\speedcheck.obj \
+ $(DIROBJ)\splay.obj \
+ $(DIROBJ)\ssh.obj \
+ $(DIROBJ)\sslgen.obj \
+ $(DIROBJ)\ssluse.obj \
+ $(DIROBJ)\strequal.obj \
+ $(DIROBJ)\strerror.obj \
+ $(DIROBJ)\strtok.obj \
+ $(DIROBJ)\strtoofft.obj \
+ $(DIROBJ)\telnet.obj \
+ $(DIROBJ)\tftp.obj \
+ $(DIROBJ)\timeval.obj \
+ $(DIROBJ)\transfer.obj \
+ $(DIROBJ)\url.obj \
+ $(DIROBJ)\version.obj \
+ $(DIROBJ)\warnless.obj \
+ $(DIROBJ)\wildcard.obj \
$(RESOURCE)
all : $(TARGET)
View
2  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().
View
24 lib/README.hostip
@@ -1,7 +1,7 @@
- curl_hostip.c explained
+ hostip.c explained
==================
- The main COMPILE-TIME DEFINES to keep in mind when reading the curl_host*.c
+ The main COMPILE-TIME DEFINES to keep in mind when reading the host*.c
source file are these:
CURLRES_IPV6 - this host has getaddrinfo() and family, and thus we use
@@ -21,15 +21,15 @@
libcurl is not built to use an asynchronous resolver, CURLRES_SYNCH is
defined.
- The curl_host*.c sources files are split up like this:
+ The host*.c sources files are split up like this:
- curl_hostip.c - method-independent resolver functions and utility functions
- curl_hostasyn.c - functions for asynchronous name resolves
- curl_hostsyn.c - functions for synchronous name resolves
- curl_hostares.c - functions for ares-using name resolves
- curl_hostthre.c - functions for threaded name resolves
- curl_hostip4.c - ipv4-specific functions
- curl_hostip6.c - ipv6-specific functions
+ hostip.c - method-independent resolver functions and utility functions
+ hostasyn.c - functions for asynchronous name resolves
+ hostsyn.c - functions for synchronous name resolves
+ hostares.c - functions for ares-using name resolves
+ hostthre.c - functions for threaded name resolves
+ hostip4.c - ipv4-specific functions
+ hostip6.c - ipv6-specific functions
- The curl_hostip.h is the single united header file for all this. It defines
- the CURLRES_* defines based on the config*.h and curl_setup.h defines.
+ The hostip.h is the single united header file for all this. It defines the
+ CURLRES_* defines based on the config*.h and setup.h defines.
View
4 lib/curl_amigaos.c → 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;
View
2  lib/curl_amigaos.h → lib/amigaos.h
@@ -21,7 +21,7 @@
* KIND, either express or implied.
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#if defined(__AMIGA__) && !defined(__ixemul__)
View
0  lib/curl_arpa_telnet.h → lib/arpa_telnet.h
File renamed without changes
View
30 lib/curl_asyn_ares.c → lib/asyn-ares.c
@@ -20,7 +20,7 @@
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#ifdef HAVE_LIMITS_H
#include <limits.h>
@@ -51,23 +51,23 @@
/***********************************************************************
* Only for ares-enabled builds
* And only for functions that fulfill the asynch resolver backend API
- * as defined in curl_asyn.h, nothing else belongs in this file!
+ * as defined in asyn.h, nothing else belongs in this file!
**********************************************************************/
#ifdef CURLRES_ARES
-#include "curl_urldata.h"
-#include "curl_sendf.h"
-#include "curl_hostip.h"
-#include "curl_hash.h"
-#include "curl_share.h"
-#include "curl_strerror.h"
-#include "curl_url.h"
-#include "curl_multiif.h"
-#include "curl_inet_pton.h"
-#include "curl_connect.h"
-#include "curl_select.h"
-#include "curl_progress.h"
+#include "urldata.h"
+#include "sendf.h"
+#include "hostip.h"
+#include "hash.h"
+#include "share.h"
+#include "strerror.h"
+#include "url.h"
+#include "multiif.h"
+#include "inet_pton.h"
+#include "connect.h"
+#include "select.h"
+#include "progress.h"
#define _MPRINTF_REPLACE /* use our functions only */
#include <curl/mprintf.h>
@@ -87,7 +87,7 @@
#include "curl_memory.h"
/* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
struct ResolverResults {
int num_pending; /* number of ares_gethostbyname() requests */
View
24 lib/curl_asyn_thread.c → lib/asyn-thread.c
@@ -20,7 +20,7 @@
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#ifdef HAVE_NETINET_IN_H
#include <netinet/in.h>
@@ -57,16 +57,16 @@
# define RESOLVER_ENOMEM ENOMEM
#endif
-#include "curl_urldata.h"
-#include "curl_sendf.h"
-#include "curl_hostip.h"
-#include "curl_hash.h"
-#include "curl_share.h"
-#include "curl_strerror.h"
-#include "curl_url.h"
-#include "curl_multiif.h"
-#include "curl_inet_pton.h"
-#include "curl_inet_ntop.h"
+#include "urldata.h"
+#include "sendf.h"
+#include "hostip.h"
+#include "hash.h"
+#include "share.h"
+#include "strerror.h"
+#include "url.h"
+#include "multiif.h"
+#include "inet_pton.h"
+#include "inet_ntop.h"
#include "curl_threads.h"
#define _MPRINTF_REPLACE /* use our functions only */
@@ -74,7 +74,7 @@
#include "curl_memory.h"
/* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
/***********************************************************************
* Only for threaded name resolves builds
View
8 lib/curl_asyn.h → lib/asyn.h
@@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -22,7 +22,7 @@
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#include "curl_addrinfo.h"
struct addrinfo;
@@ -34,8 +34,8 @@ struct Curl_dns_entry;
/*
* This header defines all functions in the internal asynch resolver interface.
* All asynch resolvers need to provide these functions.
- * curl_asyn_ares.c and curl_asyn_thread.c are the current implementations of
- * asynch resolver backends.
+ * asyn-ares.c and asyn-thread.c are the current implementations of asynch
+ * resolver backends.
*/
/*
View
58 lib/curl_axtls.c → lib/axtls.c
@@ -5,8 +5,8 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 2010, DirecTV * contact: Eric Hu <ehu@directv.com>
- * Copyright (C) 2010 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 2010, DirecTV
+ * contact: Eric Hu <ehu@directv.com>
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -23,27 +23,27 @@
/*
* Source file for all axTLS-specific code for the TLS/SSL layer. No code
- * but curl_sslgen.c should ever call or use these functions.
+ * but sslgen.c should ever call or use these functions.
*/
-#include "curl_setup.h"
+#include "setup.h"
#ifdef USE_AXTLS
#include <axTLS/ssl.h>
-#include "curl_axtls.h"
-
-#include "curl_sendf.h"
-#include "curl_inet_pton.h"
-#include "curl_sslgen.h"
-#include "curl_parsedate.h"
-#include "curl_connect.h" /* for the connect timeout */
-#include "curl_select.h"
+#include "axtls.h"
+
+#include "sendf.h"
+#include "inet_pton.h"
+#include "sslgen.h"
+#include "parsedate.h"
+#include "connect.h" /* for the connect timeout */
+#include "select.h"
#define _MPRINTF_REPLACE /* use our functions only */
#include <curl/mprintf.h>
#include "curl_memory.h"
/* The last #include file should be: */
-#include "curl_memdebug.h"
-#include "curl_hostcheck.h"
+#include "memdebug.h"
+#include "hostcheck.h"
/* SSL_read is opied from axTLS compat layer */
@@ -65,14 +65,14 @@ static int SSL_read(SSL *ssl, void *buf, int num)
int Curl_axtls_init(void)
{
/* axTLS has no global init. Everything is done through SSL and SSL_CTX
- * structs stored in connectdata structure. Perhaps can move to curl_axtls.h.
+ * structs stored in connectdata structure. Perhaps can move to axtls.h.
*/
return 1;
}
int Curl_axtls_cleanup(void)
{
- /* axTLS has no global cleanup. Perhaps can move this to curl_axtls.h. */
+ /* axTLS has no global cleanup. Perhaps can move this to axtls.h. */
return 1;
}
@@ -199,7 +199,7 @@ Curl_axtls_connect(struct connectdata *conn,
infof(data, "found certificates in %s\n", data->set.ssl.CAfile);
}
- /* curl_gtls.c tasks we're skipping for now:
+ /* gtls.c tasks we're skipping for now:
* 1) certificate revocation list checking
* 2) dns name assignment to host
* 3) set protocol priority. axTLS is TLSv1 only, so can probably ignore
@@ -255,7 +255,7 @@ Curl_axtls_connect(struct connectdata *conn,
}
}
- /* curl_gtls.c does more here that is being left out for now
+ /* gtls.c does more here that is being left out for now
* 1) set session credentials. can probably ignore since axtls puts this
* info in the ssl_ctx struct
* 2) setting up callbacks. these seem gnutls specific
@@ -280,7 +280,7 @@ Curl_axtls_connect(struct connectdata *conn,
}
infof (data, "handshake completed successfully\n");
- /* Here, curl_gtls.c gets the peer certificates and fails out depending on
+ /* Here, gtls.c gets the peer certificates and fails out depending on
* settings in "data." axTLS api doesn't have get cert chain fcn, so omit?
*/
@@ -295,10 +295,10 @@ Curl_axtls_connect(struct connectdata *conn,
else
infof(data, "\t server certificate verification SKIPPED\n");
- /* Here, curl_gtls.c does issuer verification. axTLS has no straightforward
+ /* Here, gtls.c does issuer verification. axTLS has no straightforward
* equivalent, so omitting for now.*/
- /* Here, curl_gtls.c does the following
+ /* Here, gtls.c does the following
* 1) x509 hostname checking per RFC2818. axTLS doesn't support this, but
* it seems useful. This is now implemented, by Oscar Koeroo
* 2) checks cert validity based on time. axTLS does this in ssl_verify_cert
@@ -408,10 +408,10 @@ void Curl_axtls_close(struct connectdata *conn, int sockindex)
infof(conn->data, " Curl_axtls_close\n");
if(connssl->ssl) {
- /* line from curl_ssluse.c: (void)SSL_shutdown(connssl->ssl);
+ /* line from ssluse.c: (void)SSL_shutdown(connssl->ssl);
axTLS compat layer does nothing for SSL_shutdown */
- /* The following line is from curl_ssluse.c. There seems to be no axTLS
+ /* The following line is from ssluse.c. There seems to be no axTLS
equivalent. ssl_free and ssl_ctx_free close things.
SSL_set_connect_state(connssl->handle); */
@@ -430,9 +430,8 @@ void Curl_axtls_close(struct connectdata *conn, int sockindex)
*/
int Curl_axtls_shutdown(struct connectdata *conn, int sockindex)
{
- /* Outline taken from curl_ssluse.c since functions are in axTLS compat
- layer. axTLS's error set is much smaller, so a lot of error-handling
- was removed.
+ /* Outline taken from ssluse.c since functions are in axTLS compat layer.
+ axTLS's error set is much smaller, so a lot of error-handling was removed.
*/
int retval = 0;
struct ssl_connect_data *connssl = &conn->ssl[sockindex];
@@ -522,8 +521,7 @@ static ssize_t axtls_recv(struct connectdata *conn, /* connection data */
*/
int Curl_axtls_check_cxn(struct connectdata *conn)
{
- /* curl_ssluse.c line:
- rc = SSL_peek(conn->ssl[FIRSTSOCKET].ssl, (void*)&buf, 1);
+ /* ssluse.c line: rc = SSL_peek(conn->ssl[FIRSTSOCKET].ssl, (void*)&buf, 1);
axTLS compat layer always returns the last argument, so connection is
always alive? */
@@ -535,8 +533,8 @@ void Curl_axtls_session_free(void *ptr)
{
(void)ptr;
/* free the ID */
- /* both curl_ssluse.c and curl_gtls.c do something here, but axTLS's
- OpenSSL compatibility layer does nothing, so we do nothing too. */
+ /* both ssluse.c and gtls.c do something here, but axTLS's OpenSSL
+ compatibility layer does nothing, so we do nothing too. */
}
size_t Curl_axtls_version(char *buffer, size_t size)
View
2  lib/curl_axtls.h → 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);
View
14 lib/curl_base64.c → lib/base64.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -22,19 +22,19 @@
/* Base64 encoding/decoding */
-#include "curl_setup.h"
+#include "setup.h"
#define _MPRINTF_REPLACE /* use our functions only */
#include <curl/mprintf.h>
-#include "curl_urldata.h" /* for the SessionHandle definition */
-#include "curl_warnless.h"
+#include "urldata.h" /* for the SessionHandle definition */
+#include "warnless.h"
#include "curl_base64.h"
#include "curl_memory.h"
-#include "curl_non_ascii.h"
+#include "non-ascii.h"
-/* include curl_memdebug.h last */
-#include "curl_memdebug.h"
+/* include memdebug.h last */
+#include "memdebug.h"
/* ---- Base64 Encoding/Decoding Table --- */
static const char table64[]=
View
18 lib/curl_bundles.c → lib/bundles.c
@@ -21,21 +21,21 @@
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#include <curl/curl.h>
-#include "curl_urldata.h"
-#include "curl_url.h"
-#include "curl_progress.h"
-#include "curl_multiif.h"
-#include "curl_bundles.h"
-#include "curl_sendf.h"
-#include "curl_rawstr.h"
+#include "urldata.h"
+#include "url.h"
+#include "progress.h"
+#include "multiif.h"
+#include "bundles.h"
+#include "sendf.h"
+#include "rawstr.h"
#include "curl_memory.h"
/* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
static void conn_llist_dtor(void *user, void *element)
{
View
0  lib/curl_bundles.h → lib/bundles.h
File renamed without changes
View
20 lib/curl_conncache.c → lib/conncache.c
@@ -21,22 +21,22 @@
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#include <curl/curl.h>
-#include "curl_urldata.h"
-#include "curl_url.h"
-#include "curl_progress.h"
-#include "curl_multiif.h"
-#include "curl_sendf.h"
-#include "curl_rawstr.h"
-#include "curl_bundles.h"
-#include "curl_conncache.h"
+#include "urldata.h"
+#include "url.h"
+#include "progress.h"
+#include "multiif.h"
+#include "sendf.h"
+#include "rawstr.h"
+#include "bundles.h"
+#include "conncache.h"
#include "curl_memory.h"
/* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
#define CONNECTION_HASH_SIZE 97
View
0  lib/curl_conncache.h → lib/conncache.h
File renamed without changes
View
32 lib/curl_connect.c → lib/connect.c
@@ -20,7 +20,7 @@
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#ifdef HAVE_NETINET_IN_H
#include <netinet/in.h> /* <netinet/tcp.h> may need it */
@@ -59,24 +59,24 @@
#define _MPRINTF_REPLACE /* use our functions only */
#include <curl/mprintf.h>
-#include "curl_urldata.h"
-#include "curl_sendf.h"
-#include "curl_if2ip.h"
-#include "curl_strerror.h"
-#include "curl_connect.h"
+#include "urldata.h"
+#include "sendf.h"
+#include "if2ip.h"
+#include "strerror.h"
+#include "connect.h"
#include "curl_memory.h"
-#include "curl_select.h"
-#include "curl_url.h"
-#include "curl_multiif.h"
-#include "curl_sockaddr.h" /* required for Curl_sockaddr_storage */
-#include "curl_inet_ntop.h"
-#include "curl_inet_pton.h"
-#include "curl_sslgen.h" /* for Curl_ssl_check_cxn() */
-#include "curl_progress.h"
-#include "curl_warnless.h"
+#include "select.h"
+#include "url.h" /* for Curl_safefree() */
+#include "multiif.h"
+#include "sockaddr.h" /* required for Curl_sockaddr_storage */
+#include "inet_ntop.h"
+#include "inet_pton.h"
+#include "sslgen.h" /* for Curl_ssl_check_cxn() */
+#include "progress.h"
+#include "warnless.h"
/* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
#ifdef __SYMBIAN32__
/* This isn't actually supported under Symbian OS */
View
6 lib/curl_connect.h → lib/connect.h
@@ -21,10 +21,10 @@
* KIND, either express or implied.
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
-#include "curl_nonblock.h"
-#include "curl_sockaddr.h"
+#include "nonblock.h" /* for curlx_nonblock(), formerly Curl_nonblock() */
+#include "sockaddr.h"
CURLcode Curl_is_connected(struct connectdata *conn,
int sockindex,
View
10 lib/curl_content_encoding.c → lib/content_encoding.c
@@ -20,17 +20,17 @@
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#ifdef HAVE_LIBZ
-#include "curl_urldata.h"
+#include "urldata.h"
#include <curl/curl.h>
-#include "curl_sendf.h"
-#include "curl_content_encoding.h"
+#include "sendf.h"
+#include "content_encoding.h"
#include "curl_memory.h"
-#include "curl_memdebug.h"
+#include "memdebug.h"
/* Comment this out if zlib is always going to be at least ver. 1.2.0.4
(doing so will reduce code size slightly). */
View
2  lib/curl_content_encoding.h → 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)
View
20 lib/curl_cookie.c → lib/cookie.c
@@ -77,26 +77,26 @@ Example set of cookies:
****/
-#include "curl_setup.h"
+#include "setup.h"
#if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_COOKIES)
#define _MPRINTF_REPLACE
#include <curl/mprintf.h>
-#include "curl_urldata.h"
-#include "curl_cookie.h"
-#include "curl_strequal.h"
-#include "curl_strtok.h"
-#include "curl_sendf.h"
+#include "urldata.h"
+#include "cookie.h"
+#include "strequal.h"
+#include "strtok.h"
+#include "sendf.h"
#include "curl_memory.h"
-#include "curl_share.h"
-#include "curl_strtoofft.h"
-#include "curl_rawstr.h"
+#include "share.h"
+#include "strtoofft.h"
+#include "rawstr.h"
#include "curl_memrchr.h"
/* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
static void freecookie(struct Cookie *co)
{
View
2  lib/curl_cookie.h → lib/cookie.h
@@ -21,7 +21,7 @@
* KIND, either express or implied.
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#include <curl/curl.h>
View
18 lib/curl_addrinfo.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -20,7 +20,7 @@
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#include <curl/curl.h>
@@ -45,15 +45,15 @@
#endif
#include "curl_addrinfo.h"
-#include "curl_inet_pton.h"
-#include "curl_warnless.h"
+#include "inet_pton.h"
+#include "warnless.h"
#define _MPRINTF_REPLACE /* use our functions only */
#include <curl/mprintf.h>
#include "curl_memory.h"
/* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
/*
@@ -482,8 +482,8 @@ Curl_addrinfo *Curl_str2addr(char *address, int port)
* curl_dofreeaddrinfo()
*
* This is strictly for memory tracing and are using the same style as the
- * family otherwise present in curl_memdebug.c. I put these ones here since
- * they require a bunch of structs I didn't want to include there.
+ * family otherwise present in memdebug.c. I put these ones here since they
+ * require a bunch of structs I didn't want to include in memdebug.c
*/
void
@@ -502,8 +502,8 @@ curl_dofreeaddrinfo(struct addrinfo *freethis,
* curl_dogetaddrinfo()
*
* This is strictly for memory tracing and are using the same style as the
- * family otherwise present in curl_memdebug.c. I put these ones here since
- * they require a bunch of structs I didn't want to include there.
+ * family otherwise present in memdebug.c. I put these ones here since they
+ * require a bunch of structs I didn't want to include in memdebug.c
*/
int
View
2  lib/curl_addrinfo.h
@@ -22,7 +22,7 @@
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#ifdef HAVE_NETINET_IN_H
# include <netinet/in.h>
View
21 lib/curl_darwinssl.c
@@ -6,7 +6,7 @@
* \___|\___/|_| \_\_____|
*
* Copyright (C) 2012, Nick Zitzmann, <nickzman@gmail.com>.
- * Copyright (C) 2012 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -23,11 +23,10 @@
/*
* Source file for all iOS and Mac OS X SecureTransport-specific code for the
- * TLS/SSL layer. No code but curl_sslgen.c should ever call or use these
- * functions.
+ * TLS/SSL layer. No code but sslgen.c should ever call or use these functions.
*/
-#include "curl_setup.h"
+#include "setup.h"
#ifdef USE_DARWINSSL
@@ -43,12 +42,12 @@
#include <sys/sysctl.h>
#endif
-#include "curl_urldata.h"
-#include "curl_sendf.h"
-#include "curl_inet_pton.h"
-#include "curl_connect.h"
-#include "curl_select.h"
-#include "curl_sslgen.h"
+#include "urldata.h"
+#include "sendf.h"
+#include "inet_pton.h"
+#include "connect.h"
+#include "select.h"
+#include "sslgen.h"
#include "curl_darwinssl.h"
#define _MPRINTF_REPLACE /* use our functions only */
@@ -56,7 +55,7 @@
#include "curl_memory.h"
/* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
/* From MacTypes.h (which we can't include because it isn't present in iOS: */
#define ioErr -36
View
2  lib/curl_darwinssl.h
@@ -21,7 +21,7 @@
* KIND, either express or implied.