From 4a5aa6682daeea7cd7cbbb47ce3e1c310e9261c2 Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Fri, 4 Jan 2013 02:50:28 +0100 Subject: 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 --- src/CMakeLists.txt | 4 ++-- src/Makefile.Watcom | 2 +- src/Makefile.inc | 9 ++++----- src/Makefile.vc6 | 38 +++++++++++++++++++------------------- src/mkhelp.pl | 2 +- src/tool_binmode.c | 2 +- src/tool_bname.c | 2 +- src/tool_cb_dbg.c | 2 +- src/tool_cb_hdr.c | 4 ++-- src/tool_cb_prg.c | 2 +- src/tool_cb_rea.c | 2 +- src/tool_cb_see.c | 2 +- src/tool_cb_wrt.c | 2 +- src/tool_cfgable.c | 2 +- src/tool_convert.c | 2 +- src/tool_dirhie.c | 2 +- src/tool_doswin.c | 2 +- src/tool_easysrc.c | 2 +- src/tool_formparse.c | 4 ++-- src/tool_getparam.c | 4 ++-- src/tool_getpass.c | 2 +- src/tool_help.c | 2 +- src/tool_helpers.c | 4 ++-- src/tool_homedir.c | 2 +- src/tool_libinfo.c | 4 ++-- src/tool_main.c | 2 +- src/tool_metalink.c | 4 ++-- src/tool_mfiles.c | 2 +- src/tool_msgs.c | 2 +- src/tool_operate.c | 8 ++++---- src/tool_operhlp.c | 4 ++-- src/tool_panykey.c | 2 +- src/tool_paramhlp.c | 4 ++-- src/tool_parsecfg.c | 2 +- src/tool_setopt.c | 2 +- src/tool_setup.h | 8 ++++---- src/tool_sleep.c | 2 +- src/tool_urlglob.c | 2 +- src/tool_util.c | 2 +- src/tool_vms.c | 2 +- src/tool_writeenv.c | 2 +- src/tool_writeout.c | 2 +- src/tool_xattr.c | 2 +- src/vc6curlsrc.dsp | 12 ++++++------ 44 files changed, 85 insertions(+), 86 deletions(-) (limited to 'src') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index bda835779..93f86cbad 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -25,8 +25,8 @@ source_group("cURL source files" FILES ${CURL_CFILES}) source_group("cURL header files" FILES ${CURL_HFILES}) include_directories( - ${CURL_SOURCE_DIR}/lib # To be able to reach "curl_setup_once.h" - ${CURL_BINARY_DIR}/lib # To be able to reach "curl_config.h" + ${CURL_SOURCE_DIR}/lib # To be able to reach "setup_once.h" + ${CURL_BINARY_DIR}/lib # To be able to reach "curl_config.h" ${CURL_BINARY_DIR}/include # To be able to reach "curl/curlbuild.h" ) diff --git a/src/Makefile.Watcom b/src/Makefile.Watcom index 721ae8495..75edf488b 100644 --- a/src/Makefile.Watcom +++ b/src/Makefile.Watcom @@ -114,7 +114,7 @@ LINK_ARG = $(OBJ_DIR)$(DS)wlink.arg !endif # For now we still define the CURLX_ONES sources here unless we know how # to split off the prefixed path. -CURLX_SOURCES = curl_rawstr.c curl_nonblock.c +CURLX_SOURCES = rawstr.c nonblock.c OBJS = $(CURL_CFILES:.c=.obj) !ifdef %curl_static diff --git a/src/Makefile.inc b/src/Makefile.inc index 4e1d4271f..7ce30f0b6 100644 --- a/src/Makefile.inc +++ b/src/Makefile.inc @@ -9,11 +9,10 @@ # libcurl has sources that provide functions named curlx_* that aren't part of # the official API, but we re-use the code here to avoid duplication. -CURLX_ONES = \ - $(top_srcdir)/lib/curl_nonblock.c \ - $(top_srcdir)/lib/curl_rawstr.c \ - $(top_srcdir)/lib/curl_strdup.c \ - $(top_srcdir)/lib/curl_strtoofft.c +CURLX_ONES = $(top_srcdir)/lib/strtoofft.c \ + $(top_srcdir)/lib/strdup.c \ + $(top_srcdir)/lib/rawstr.c \ + $(top_srcdir)/lib/nonblock.c CURL_CFILES = \ tool_binmode.c \ diff --git a/src/Makefile.vc6 b/src/Makefile.vc6 index 415eec3c1..073b20d6a 100644 --- a/src/Makefile.vc6 +++ b/src/Makefile.vc6 @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1999 - 2013, Daniel Stenberg, , et al. +# Copyright (C) 1999 - 2012, Daniel Stenberg, , et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -134,9 +134,9 @@ CFLAGS = $(CFLAGS) /DUSE_WINDOWS_SSPI /I$(WINDOWS_SDK_PATH)\include !ENDIF RELEASE_OBJS= \ - curl_nonblockr.obj \ - curl_rawstrr.obj \ - curl_strtoofftr.obj \ + nonblockr.obj \ + rawstrr.obj \ + strtoofftr.obj \ tool_binmoder.obj \ tool_bnamer.obj \ tool_cb_dbgr.obj \ @@ -178,9 +178,9 @@ RELEASE_OBJS= \ curlr.res DEBUG_OBJS= \ - curl_nonblockd.obj \ - curl_rawstrd.obj \ - curl_strtoofftd.obj \ + nonblockd.obj \ + rawstrd.obj \ + strtoofftd.obj \ tool_binmoded.obj \ tool_bnamed.obj \ tool_cb_dbgd.obj \ @@ -341,12 +341,12 @@ debug: $(DEBUG_OBJS) $(MANIFESTTOOL) ## Release -curl_nonblockr.obj: ../lib/curl_nonblock.c - $(CCR) $(CFLAGS) /Fo"$@" ../lib/curl_nonblock.c -curl_rawstrr.obj: ../lib/curl_rawstr.c - $(CCR) $(CFLAGS) /Fo"$@" ../lib/curl_rawstr.c -curl_strtoofftr.obj: ../lib/curl_strtoofft.c - $(CCR) $(CFLAGS) /Fo"$@" ../lib/curl_strtoofft.c +nonblockr.obj: ../lib/nonblock.c + $(CCR) $(CFLAGS) /Fo"$@" ../lib/nonblock.c +rawstrr.obj: ../lib/rawstr.c + $(CCR) $(CFLAGS) /Fo"$@" ../lib/rawstr.c +strtoofftr.obj: ../lib/strtoofft.c + $(CCR) $(CFLAGS) /Fo"$@" ../lib/strtoofft.c tool_binmoder.obj: tool_binmode.c $(CCR) $(CFLAGS) /Fo"$@" tool_binmode.c tool_bnamer.obj: tool_bname.c @@ -427,12 +427,12 @@ curlr.res : curl.rc $(RCR) $(RESFLAGS) /Fo"$@" curl.rc ## Debug -curl_nonblockd.obj: ../lib/curl_nonblock.c - $(CCD) $(CFLAGS) /Fo"$@" ../lib/curl_nonblock.c -curl_rawstrd.obj: ../lib/curl_rawstr.c - $(CCD) $(CFLAGS) /Fo"$@" ../lib/curl_rawstr.c -curl_strtoofftd.obj: ../lib/curl_strtoofft.c - $(CCD) $(CFLAGS) /Fo"$@" ../lib/curl_strtoofft.c +nonblockd.obj: ../lib/nonblock.c + $(CCD) $(CFLAGS) /Fo"$@" ../lib/nonblock.c +rawstrd.obj: ../lib/rawstr.c + $(CCD) $(CFLAGS) /Fo"$@" ../lib/rawstr.c +strtoofftd.obj: ../lib/strtoofft.c + $(CCD) $(CFLAGS) /Fo"$@" ../lib/strtoofft.c tool_binmoded.obj: tool_binmode.c $(CCD) $(CFLAGS) /Fo"$@" tool_binmode.c tool_bnamed.obj: tool_bname.c diff --git a/src/mkhelp.pl b/src/mkhelp.pl index df6822aae..444b669ba 100644 --- a/src/mkhelp.pl +++ b/src/mkhelp.pl @@ -140,7 +140,7 @@ HEAD if($c) { print < -#include "curl_memdebug.h" /* keep this as LAST include */ +#include "memdebug.h" /* keep this as LAST include */ static const unsigned char hugehelpgz[] = { /* This mumbo-jumbo is the huge help text compressed with gzip. Thanks to this operation, the size of this data shrunk from $gzip diff --git a/src/tool_binmode.c b/src/tool_binmode.c index 26b50ada2..92033ac03 100644 --- a/src/tool_binmode.c +++ b/src/tool_binmode.c @@ -33,7 +33,7 @@ #include "tool_binmode.h" -#include "curl_memdebug.h" /* keep this as LAST include */ +#include "memdebug.h" /* keep this as LAST include */ void set_binmode(FILE *stream) { diff --git a/src/tool_bname.c b/src/tool_bname.c index 6a2a33165..277830546 100644 --- a/src/tool_bname.c +++ b/src/tool_bname.c @@ -23,7 +23,7 @@ #include "tool_bname.h" -#include "curl_memdebug.h" /* keep this as LAST include */ +#include "memdebug.h" /* keep this as LAST include */ #ifndef HAVE_BASENAME diff --git a/src/tool_cb_dbg.c b/src/tool_cb_dbg.c index 321c66133..1850ba0c6 100644 --- a/src/tool_cb_dbg.c +++ b/src/tool_cb_dbg.c @@ -30,7 +30,7 @@ #include "tool_cb_dbg.h" #include "tool_util.h" -#include "curl_memdebug.h" /* keep this as LAST include */ +#include "memdebug.h" /* keep this as LAST include */ static void dump(const char *timebuf, const char *text, FILE *stream, const unsigned char *ptr, size_t size, diff --git a/src/tool_cb_hdr.c b/src/tool_cb_hdr.c index e6988184a..ef340f798 100644 --- a/src/tool_cb_hdr.c +++ b/src/tool_cb_hdr.c @@ -21,7 +21,7 @@ ***************************************************************************/ #include "tool_setup.h" -#include "curl_rawstr.h" +#include "rawstr.h" #define ENABLE_CURLX_PRINTF /* use our own printf() functions */ @@ -31,7 +31,7 @@ #include "tool_msgs.h" #include "tool_cb_hdr.h" -#include "curl_memdebug.h" /* keep this as LAST include */ +#include "memdebug.h" /* keep this as LAST include */ static char *parse_filename(const char *ptr, size_t len); diff --git a/src/tool_cb_prg.c b/src/tool_cb_prg.c index 1b8842f2a..7a701b692 100644 --- a/src/tool_cb_prg.c +++ b/src/tool_cb_prg.c @@ -28,7 +28,7 @@ #include "tool_cfgable.h" #include "tool_cb_prg.h" -#include "curl_memdebug.h" /* keep this as LAST include */ +#include "memdebug.h" /* keep this as LAST include */ /* ** callback for CURLOPT_PROGRESSFUNCTION diff --git a/src/tool_cb_rea.c b/src/tool_cb_rea.c index 88dfbe852..4565a15d6 100644 --- a/src/tool_cb_rea.c +++ b/src/tool_cb_rea.c @@ -28,7 +28,7 @@ #include "tool_cfgable.h" #include "tool_cb_rea.h" -#include "curl_memdebug.h" /* keep this as LAST include */ +#include "memdebug.h" /* keep this as LAST include */ /* ** callback for CURLOPT_READFUNCTION diff --git a/src/tool_cb_see.c b/src/tool_cb_see.c index 1e36f5962..2f49e1d96 100644 --- a/src/tool_cb_see.c +++ b/src/tool_cb_see.c @@ -28,7 +28,7 @@ #include "tool_cfgable.h" #include "tool_cb_see.h" -#include "curl_memdebug.h" /* keep this as LAST include */ +#include "memdebug.h" /* keep this as LAST include */ /* OUR_MAX_SEEK_L has 'long' data type, OUR_MAX_SEEK_O has 'curl_off_t, both represent the same value. Maximum offset used here when we lseek diff --git a/src/tool_cb_wrt.c b/src/tool_cb_wrt.c index a055b444e..d6688110a 100644 --- a/src/tool_cb_wrt.c +++ b/src/tool_cb_wrt.c @@ -29,7 +29,7 @@ #include "tool_msgs.h" #include "tool_cb_wrt.h" -#include "curl_memdebug.h" /* keep this as LAST include */ +#include "memdebug.h" /* keep this as LAST include */ /* ** callback for CURLOPT_WRITEFUNCTION diff --git a/src/tool_cfgable.c b/src/tool_cfgable.c index 6cd9d33e7..da11f4afe 100644 --- a/src/tool_cfgable.c +++ b/src/tool_cfgable.c @@ -23,7 +23,7 @@ #include "tool_cfgable.h" -#include "curl_memdebug.h" /* keep this as LAST include */ +#include "memdebug.h" /* keep this as LAST include */ void free_config_fields(struct Configurable *config) { diff --git a/src/tool_convert.c b/src/tool_convert.c index 2011db0e7..ecce036a0 100644 --- a/src/tool_convert.c +++ b/src/tool_convert.c @@ -29,7 +29,7 @@ #include "tool_convert.h" -#include "curl_memdebug.h" /* keep this as LAST include */ +#include "memdebug.h" /* keep this as LAST include */ #ifdef HAVE_ICONV diff --git a/src/tool_dirhie.c b/src/tool_dirhie.c index 39158edcd..4ba1c4375 100644 --- a/src/tool_dirhie.c +++ b/src/tool_dirhie.c @@ -33,7 +33,7 @@ #include "tool_dirhie.h" -#include "curl_memdebug.h" /* keep this as LAST include */ +#include "memdebug.h" /* keep this as LAST include */ #ifdef NETWARE # ifndef __NOVELL_LIBC__ diff --git a/src/tool_doswin.c b/src/tool_doswin.c index 5afff1ecf..4fae91d32 100644 --- a/src/tool_doswin.c +++ b/src/tool_doswin.c @@ -35,7 +35,7 @@ #include "tool_bname.h" #include "tool_doswin.h" -#include "curl_memdebug.h" /* keep this as LAST include */ +#include "memdebug.h" /* keep this as LAST include */ /* * Macros ALWAYS_TRUE and ALWAYS_FALSE are used to avoid compiler warnings. diff --git a/src/tool_easysrc.c b/src/tool_easysrc.c index 6aaa4116a..339dde563 100644 --- a/src/tool_easysrc.c +++ b/src/tool_easysrc.c @@ -31,7 +31,7 @@ #include "tool_easysrc.h" #include "tool_msgs.h" -#include "curl_memdebug.h" /* keep this as LAST include */ +#include "memdebug.h" /* keep this as LAST include */ /* global variable definitions, for easy-interface source code generation */ diff --git a/src/tool_formparse.c b/src/tool_formparse.c index 76a5db1fc..12b1a9d46 100644 --- a/src/tool_formparse.c +++ b/src/tool_formparse.c @@ -21,7 +21,7 @@ ***************************************************************************/ #include "tool_setup.h" -#include "curl_rawstr.h" +#include "rawstr.h" #define ENABLE_CURLX_PRINTF /* use our own printf() functions */ @@ -32,7 +32,7 @@ #include "tool_msgs.h" #include "tool_formparse.h" -#include "curl_memdebug.h" /* keep this as LAST include */ +#include "memdebug.h" /* keep this as LAST include */ /*************************************************************************** * diff --git a/src/tool_getparam.c b/src/tool_getparam.c index 9938e24ec..297b986f5 100644 --- a/src/tool_getparam.c +++ b/src/tool_getparam.c @@ -21,7 +21,7 @@ ***************************************************************************/ #include "tool_setup.h" -#include "curl_rawstr.h" +#include "rawstr.h" #define ENABLE_CURLX_PRINTF /* use our own printf() functions */ @@ -45,7 +45,7 @@ #include "tool_parsecfg.h" #include "tool_version.h" -#include "curl_memdebug.h" /* keep this as LAST include */ +#include "memdebug.h" /* keep this as LAST include */ #ifdef MSDOS # define USE_WATT32 diff --git a/src/tool_getpass.c b/src/tool_getpass.c index 6a841d414..0ac7dcbe0 100644 --- a/src/tool_getpass.c +++ b/src/tool_getpass.c @@ -57,7 +57,7 @@ #include "tool_getpass.h" -#include "curl_memdebug.h" /* keep this as LAST include */ +#include "memdebug.h" /* keep this as LAST include */ #ifdef __VMS /* VMS implementation */ diff --git a/src/tool_help.c b/src/tool_help.c index 682fee980..124f6404d 100644 --- a/src/tool_help.c +++ b/src/tool_help.c @@ -24,7 +24,7 @@ #include "tool_panykey.h" #include "tool_help.h" -#include "curl_memdebug.h" /* keep this as LAST include */ +#include "memdebug.h" /* keep this as LAST include */ #ifdef MSDOS # define USE_WATT32 diff --git a/src/tool_helpers.c b/src/tool_helpers.c index e37576464..ae8aaaf32 100644 --- a/src/tool_helpers.c +++ b/src/tool_helpers.c @@ -21,7 +21,7 @@ ***************************************************************************/ #include "tool_setup.h" -#include "curl_rawstr.h" +#include "rawstr.h" #define ENABLE_CURLX_PRINTF /* use our own printf() functions */ @@ -32,7 +32,7 @@ #include "tool_getparam.h" #include "tool_helpers.h" -#include "curl_memdebug.h" /* keep this as LAST include */ +#include "memdebug.h" /* keep this as LAST include */ /* ** Helper functions that are used from more tha one source file. diff --git a/src/tool_homedir.c b/src/tool_homedir.c index a6e07928f..cb90095e5 100644 --- a/src/tool_homedir.c +++ b/src/tool_homedir.c @@ -30,7 +30,7 @@ #include "tool_homedir.h" -#include "curl_memdebug.h" /* keep this as LAST include */ +#include "memdebug.h" /* keep this as LAST include */ static char *GetEnv(const char *variable, char do_expand) { diff --git a/src/tool_libinfo.c b/src/tool_libinfo.c index c6013a761..81b6680c8 100644 --- a/src/tool_libinfo.c +++ b/src/tool_libinfo.c @@ -21,7 +21,7 @@ ***************************************************************************/ #include "tool_setup.h" -#include "curl_rawstr.h" +#include "rawstr.h" #define ENABLE_CURLX_PRINTF /* use our own printf() functions */ @@ -29,7 +29,7 @@ #include "tool_libinfo.h" -#include "curl_memdebug.h" /* keep this as LAST include */ +#include "memdebug.h" /* keep this as LAST include */ /* global variable definitions, for libcurl run-time info */ diff --git a/src/tool_main.c b/src/tool_main.c index dc6d8d75d..9c0a19f3f 100644 --- a/src/tool_main.c +++ b/src/tool_main.c @@ -39,7 +39,7 @@ * the library level code from this client-side is ugly, but we do this * anyway for convenience. */ -#include "curl_memdebug.h" /* keep this as LAST include */ +#include "memdebug.h" /* keep this as LAST include */ #ifdef __VMS static int vms_show = 0; diff --git a/src/tool_metalink.c b/src/tool_metalink.c index ff5f19c3f..f9e9869b2 100644 --- a/src/tool_metalink.c +++ b/src/tool_metalink.c @@ -89,7 +89,7 @@ struct win32_crypto_hash { # error "Can't compile METALINK support without a crypto library." #endif -#include "curl_rawstr.h" +#include "rawstr.h" #define ENABLE_CURLX_PRINTF /* use our own printf() functions */ @@ -101,7 +101,7 @@ struct win32_crypto_hash { #include "tool_metalink.h" #include "tool_msgs.h" -#include "curl_memdebug.h" /* keep this as LAST include */ +#include "memdebug.h" /* keep this as LAST include */ /* Copied from tool_getparam.c */ #define GetStr(str,val) do { \ diff --git a/src/tool_mfiles.c b/src/tool_mfiles.c index e0cebb109..3eda45f91 100644 --- a/src/tool_mfiles.c +++ b/src/tool_mfiles.c @@ -23,7 +23,7 @@ #include "tool_mfiles.h" -#include "curl_memdebug.h" /* keep this as LAST include */ +#include "memdebug.h" /* keep this as LAST include */ static void AppendNode(struct multi_files **first, struct multi_files **last, diff --git a/src/tool_msgs.c b/src/tool_msgs.c index 9c58afa9c..80fdf4e27 100644 --- a/src/tool_msgs.c +++ b/src/tool_msgs.c @@ -28,7 +28,7 @@ #include "tool_cfgable.h" #include "tool_msgs.h" -#include "curl_memdebug.h" /* keep this as LAST include */ +#include "memdebug.h" /* keep this as LAST include */ #define WARN_PREFIX "Warning: " #define WARN_TEXTWIDTH (79 - (int)strlen(WARN_PREFIX)) diff --git a/src/tool_operate.c b/src/tool_operate.c index 1f03f0726..bcbce2000 100644 --- a/src/tool_operate.c +++ b/src/tool_operate.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2013, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2012, Daniel Stenberg, , et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -39,7 +39,7 @@ # include #endif -#include "curl_rawstr.h" +#include "rawstr.h" #define ENABLE_CURLX_PRINTF /* use our own printf() functions */ @@ -74,7 +74,7 @@ #include "tool_writeout.h" #include "tool_xattr.h" -#include "curl_memdebug.h" /* keep this as LAST include */ +#include "memdebug.h" /* keep this as LAST include */ #define CURLseparator "--_curl_--" @@ -849,7 +849,7 @@ int operate(struct Configurable *config, int argc, argv_item_t argv[]) input.fd = infd; input.config = config; /* Note that if CURLOPT_READFUNCTION is fread (the default), then - * lib/curl_telnet.c will Curl_poll() on the input file descriptor + * lib/telnet.c will Curl_poll() on the input file descriptor * rather then calling the READFUNCTION at regular intervals. * The circumstances in which it is preferable to enable this * behaviour, by omitting to set the READFUNCTION & READDATA options, diff --git a/src/tool_operhlp.c b/src/tool_operhlp.c index 4f8cdf0c0..9078b9564 100644 --- a/src/tool_operhlp.c +++ b/src/tool_operhlp.c @@ -21,7 +21,7 @@ ***************************************************************************/ #include "tool_setup.h" -#include "curl_rawstr.h" +#include "rawstr.h" #define ENABLE_CURLX_PRINTF /* use our own printf() functions */ @@ -37,7 +37,7 @@ # include "tool_metalink.h" #endif -#include "curl_memdebug.h" /* keep this as LAST include */ +#include "memdebug.h" /* keep this as LAST include */ /* * my_useragent: returns allocated string with default user agent diff --git a/src/tool_panykey.c b/src/tool_panykey.c index 632cd34bd..d8718e328 100644 --- a/src/tool_panykey.c +++ b/src/tool_panykey.c @@ -33,7 +33,7 @@ #include "tool_panykey.h" -#include "curl_memdebug.h" /* keep this as LAST include */ +#include "memdebug.h" /* keep this as LAST include */ void tool_pressanykey(void) { diff --git a/src/tool_paramhlp.c b/src/tool_paramhlp.c index fe2514dfb..5d6f8bbc5 100644 --- a/src/tool_paramhlp.c +++ b/src/tool_paramhlp.c @@ -21,7 +21,7 @@ ***************************************************************************/ #include "tool_setup.h" -#include "curl_rawstr.h" +#include "rawstr.h" #define ENABLE_CURLX_PRINTF /* use our own printf() functions */ @@ -34,7 +34,7 @@ #include "tool_msgs.h" #include "tool_paramhlp.h" -#include "curl_memdebug.h" /* keep this as LAST include */ +#include "memdebug.h" /* keep this as LAST include */ struct getout *new_getout(struct Configurable *config) { diff --git a/src/tool_parsecfg.c b/src/tool_parsecfg.c index 21d9e90c5..561dada11 100644 --- a/src/tool_parsecfg.c +++ b/src/tool_parsecfg.c @@ -32,7 +32,7 @@ #include "tool_msgs.h" #include "tool_parsecfg.h" -#include "curl_memdebug.h" /* keep this as LAST include */ +#include "memdebug.h" /* keep this as LAST include */ #define CURLRC DOT_CHAR "curlrc" #define ISSEP(x) (((x) == '=') || ((x) == ':')) diff --git a/src/tool_setopt.c b/src/tool_setopt.c index 08c1af5cb..9aefc21d5 100644 --- a/src/tool_setopt.c +++ b/src/tool_setopt.c @@ -31,7 +31,7 @@ #include "tool_easysrc.h" #include "tool_setopt.h" -#include "curl_memdebug.h" /* keep this as LAST include */ +#include "memdebug.h" /* keep this as LAST include */ /* Lookup tables for converting setopt values back to symbols */ /* For enums, values may be in any order. */ diff --git a/src/tool_setup.h b/src/tool_setup.h index d3dab5c0b..ed3849ba3 100644 --- a/src/tool_setup.h +++ b/src/tool_setup.h @@ -25,15 +25,15 @@ #define CURL_NO_OLDIES /* - * curl_setup.h may define preprocessor macros such as _FILE_OFFSET_BITS and + * setup.h may define preprocessor macros such as _FILE_OFFSET_BITS and * _LARGE_FILES in order to support files larger than 2 GB. On platforms * where this happens it is mandatory that these macros are defined before * any system header file is included, otherwise file handling function * prototypes will be misdeclared and curl tool may not build properly; - * therefore we must include curl_setup.h before curl.h when building curl. + * therefore we must include setup.h before curl.h when building curl. */ -#include "curl_setup.h" /* from the lib directory */ +#include "setup.h" /* from the lib directory */ /* * curl tool certainly uses libcurl's external interface. @@ -67,7 +67,7 @@ #endif #ifndef HAVE_STRDUP -# include "curl_strdup.h" +# include "strdup.h" # define strdup(ptr) curlx_strdup(ptr) #endif diff --git a/src/tool_sleep.c b/src/tool_sleep.c index e37cde4a5..49cdc71b8 100644 --- a/src/tool_sleep.c +++ b/src/tool_sleep.c @@ -37,7 +37,7 @@ #include "tool_sleep.h" -#include "curl_memdebug.h" /* keep this as LAST include */ +#include "memdebug.h" /* keep this as LAST include */ void tool_go_sleep(long ms) { diff --git a/src/tool_urlglob.c b/src/tool_urlglob.c index 663370a51..2821d008d 100644 --- a/src/tool_urlglob.c +++ b/src/tool_urlglob.c @@ -27,7 +27,7 @@ #include "tool_urlglob.h" #include "tool_vms.h" -#include "curl_memdebug.h" /* keep this as LAST include */ +#include "memdebug.h" /* keep this as LAST include */ typedef enum { GLOB_OK, diff --git a/src/tool_util.c b/src/tool_util.c index 0a0fa6960..00d205ebc 100644 --- a/src/tool_util.c +++ b/src/tool_util.c @@ -23,7 +23,7 @@ #include "tool_util.h" -#include "curl_memdebug.h" /* keep this as LAST include */ +#include "memdebug.h" /* keep this as LAST include */ #if defined(WIN32) && !defined(MSDOS) diff --git a/src/tool_vms.c b/src/tool_vms.c index abb5d1a04..4a6a6f58e 100644 --- a/src/tool_vms.c +++ b/src/tool_vms.c @@ -34,7 +34,7 @@ #include "curlmsg_vms.h" #include "tool_vms.h" -#include "curl_memdebug.h" /* keep this as LAST include */ +#include "memdebug.h" /* keep this as LAST include */ void decc$__posix_exit(int __status); void decc$exit(int __status); diff --git a/src/tool_writeenv.c b/src/tool_writeenv.c index 918a8009d..a9462d004 100644 --- a/src/tool_writeenv.c +++ b/src/tool_writeenv.c @@ -32,7 +32,7 @@ #include "tool_writeenv.h" -#include "curl_memdebug.h" /* keep this as LAST include */ +#include "memdebug.h" /* keep this as LAST include */ static const struct { diff --git a/src/tool_writeout.c b/src/tool_writeout.c index e84b7ef22..3c32067e3 100644 --- a/src/tool_writeout.c +++ b/src/tool_writeout.c @@ -27,7 +27,7 @@ #include "tool_cfgable.h" #include "tool_writeout.h" -#include "curl_memdebug.h" /* keep this as LAST include */ +#include "memdebug.h" /* keep this as LAST include */ typedef enum { VAR_NONE, /* must be the first */ diff --git a/src/tool_xattr.c b/src/tool_xattr.c index cc74c9da2..505bdb17a 100644 --- a/src/tool_xattr.c +++ b/src/tool_xattr.c @@ -27,7 +27,7 @@ #include "tool_xattr.h" -#include "curl_memdebug.h" /* keep this as LAST include */ +#include "memdebug.h" /* keep this as LAST include */ #ifdef HAVE_FSETXATTR diff --git a/src/vc6curlsrc.dsp b/src/vc6curlsrc.dsp index 7bd3ff011..5fb7fe1d1 100644 --- a/src/vc6curlsrc.dsp +++ b/src/vc6curlsrc.dsp @@ -139,15 +139,15 @@ LINK32=link.exe # PROP Default_Filter "" # Begin Source File -SOURCE=..\lib\curl_nonblock.c +SOURCE=..\lib\nonblock.c # End Source File # Begin Source File -SOURCE=..\lib\curl_rawstr.c +SOURCE=..\lib\rawstr.c # End Source File # Begin Source File -SOURCE=..\lib\curl_strtoofft.c +SOURCE=..\lib\strtoofft.c # End Source File # Begin Source File @@ -311,15 +311,15 @@ SOURCE=".\config-win32.h" # End Source File # Begin Source File -SOURCE=..\lib\curl_nonblock.h +SOURCE=..\lib\nonblock.h # End Source File # Begin Source File -SOURCE=..\lib\curl_rawstr.h +SOURCE=..\lib\rawstr.h # End Source File # Begin Source File -SOURCE=..\lib\curl_strtoofft.h +SOURCE=..\lib\strtoofft.h # End Source File # Begin Source File -- cgit v1.2.3