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 --- tests/convsrctest.pl | 4 +-- tests/libtest/CMakeLists.txt | 2 +- tests/libtest/Makefile.inc | 2 +- tests/libtest/chkhostname.c | 2 +- tests/libtest/first.c | 2 +- tests/libtest/lib1500.c | 4 +-- tests/libtest/lib1501.c | 4 +-- tests/libtest/lib1502.c | 4 +-- tests/libtest/lib500.c | 2 +- tests/libtest/lib501.c | 2 +- tests/libtest/lib502.c | 4 +-- tests/libtest/lib503.c | 4 +-- tests/libtest/lib504.c | 4 +-- tests/libtest/lib505.c | 2 +- tests/libtest/lib506.c | 2 +- tests/libtest/lib507.c | 4 +-- tests/libtest/lib508.c | 2 +- tests/libtest/lib510.c | 2 +- tests/libtest/lib511.c | 2 +- tests/libtest/lib512.c | 2 +- tests/libtest/lib513.c | 2 +- tests/libtest/lib514.c | 2 +- tests/libtest/lib515.c | 2 +- tests/libtest/lib516.c | 2 +- tests/libtest/lib517.c | 2 +- tests/libtest/lib518.c | 8 +++--- tests/libtest/lib519.c | 2 +- tests/libtest/lib520.c | 2 +- tests/libtest/lib521.c | 2 +- tests/libtest/lib523.c | 2 +- tests/libtest/lib524.c | 2 +- tests/libtest/lib525.c | 4 +-- tests/libtest/lib526.c | 4 +-- tests/libtest/lib530.c | 4 +-- tests/libtest/lib533.c | 4 +-- tests/libtest/lib536.c | 4 +-- tests/libtest/lib537.c | 8 +++--- tests/libtest/lib539.c | 2 +- tests/libtest/lib540.c | 4 +-- tests/libtest/lib541.c | 2 +- tests/libtest/lib542.c | 2 +- tests/libtest/lib543.c | 2 +- tests/libtest/lib544.c | 2 +- tests/libtest/lib547.c | 2 +- tests/libtest/lib549.c | 2 +- tests/libtest/lib552.c | 4 +-- tests/libtest/lib553.c | 2 +- tests/libtest/lib554.c | 2 +- tests/libtest/lib555.c | 4 +-- tests/libtest/lib556.c | 2 +- tests/libtest/lib557.c | 2 +- tests/libtest/lib560.c | 4 +-- tests/libtest/lib562.c | 2 +- tests/libtest/lib564.c | 4 +-- tests/libtest/lib566.c | 2 +- tests/libtest/lib567.c | 2 +- tests/libtest/lib568.c | 2 +- tests/libtest/lib569.c | 2 +- tests/libtest/lib570.c | 2 +- tests/libtest/lib571.c | 4 +-- tests/libtest/lib572.c | 2 +- tests/libtest/lib573.c | 4 +-- tests/libtest/lib574.c | 2 +- tests/libtest/lib575.c | 4 +-- tests/libtest/lib576.c | 2 +- tests/libtest/lib578.c | 2 +- tests/libtest/lib579.c | 2 +- tests/libtest/lib582.c | 4 +-- tests/libtest/lib583.c | 2 +- tests/libtest/lib586.c | 2 +- tests/libtest/lib590.c | 2 +- tests/libtest/lib591.c | 4 +-- tests/libtest/lib597.c | 4 +-- tests/libtest/lib598.c | 2 +- tests/libtest/lib599.c | 2 +- tests/libtest/libauthretry.c | 4 +-- tests/libtest/libntlmconnect.c | 4 +-- tests/libtest/sethostname.c | 2 +- tests/libtest/test.h | 12 ++++----- tests/libtest/testtrace.c | 2 +- tests/libtest/testutil.c | 4 +-- tests/libtest/testutil.h | 2 +- tests/mem-include-scan.pl | 4 +-- tests/memanalyze.pl | 16 +++++------ tests/server/CMakeLists.txt | 18 ++++++------- tests/server/Makefile.inc | 34 +++++++++++------------ tests/server/fake_ntlm.c | 4 +-- tests/server/getpart.c | 4 +-- tests/server/resolve.c | 6 ++--- tests/server/rtspd.c | 4 +-- tests/server/server_setup.h | 3 +-- tests/server/server_tftp.h | 61 ------------------------------------------ tests/server/sockfilt.c | 6 ++--- tests/server/sws.c | 6 ++--- tests/server/testpart.c | 4 +-- tests/server/tftp.h | 61 ++++++++++++++++++++++++++++++++++++++++++ tests/server/tftpd.c | 6 ++--- tests/server/util.c | 2 +- tests/unit/unit1300.c | 2 +- tests/unit/unit1301.c | 2 +- tests/unit/unit1302.c | 6 ++--- tests/unit/unit1303.c | 6 ++--- tests/unit/unit1304.c | 2 +- tests/unit/unit1305.c | 6 ++--- tests/unit/unit1309.c | 2 +- 105 files changed, 252 insertions(+), 253 deletions(-) delete mode 100644 tests/server/server_tftp.h create mode 100644 tests/server/tftp.h (limited to 'tests') diff --git a/tests/convsrctest.pl b/tests/convsrctest.pl index 6c0047ef6..ee442394c 100755 --- a/tests/convsrctest.pl +++ b/tests/convsrctest.pl @@ -6,7 +6,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2012, Daniel Stenberg, , et al. +# Copyright (C) 1998 - 2011, 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 @@ -45,7 +45,7 @@ require "getpart.pm"; # Boilerplate code for test tool my $head = '#include "test.h" -#include "curl_memdebug.h" +#include "memdebug.h" int test(char *URL) { diff --git a/tests/libtest/CMakeLists.txt b/tests/libtest/CMakeLists.txt index 733cdd31b..896686bd8 100644 --- a/tests/libtest/CMakeLists.txt +++ b/tests/libtest/CMakeLists.txt @@ -5,7 +5,7 @@ function(SETUP_TEST TEST_NAME) # ARGN are the files in the test string(TOUPPER ${TEST_NAME} UPPER_TEST_NAME) include_directories( - ${CURL_SOURCE_DIR}/lib # To be able to reach "curl_setup_once.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/tests/libtest/Makefile.inc b/tests/libtest/Makefile.inc index 7de115ea2..b9789f88f 100644 --- a/tests/libtest/Makefile.inc +++ b/tests/libtest/Makefile.inc @@ -5,7 +5,7 @@ TESTUTIL = testutil.c testutil.h TSTTRACE = testtrace.c testtrace.h # files used only in some libcurl test programs -WARNLESS = $(top_srcdir)/lib/curl_warnless.c $(top_srcdir)/lib/curl_warnless.h +WARNLESS = $(top_srcdir)/lib/warnless.c $(top_srcdir)/lib/warnless.h # these files are used in every single test program below SUPPORTFILES = first.c test.h diff --git a/tests/libtest/chkhostname.c b/tests/libtest/chkhostname.c index 168294ab6..a18c92e8f 100644 --- a/tests/libtest/chkhostname.c +++ b/tests/libtest/chkhostname.c @@ -19,7 +19,7 @@ * KIND, either express or implied. * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #include "curl_gethostname.h" diff --git a/tests/libtest/first.c b/tests/libtest/first.c index 4533548cd..253acb21d 100644 --- a/tests/libtest/first.c +++ b/tests/libtest/first.c @@ -27,7 +27,7 @@ #ifdef CURLDEBUG # define MEMDEBUG_NODEFINES -# include "curl_memdebug.h" +# include "memdebug.h" #endif int select_wrapper(int nfds, fd_set *rd, fd_set *wr, fd_set *exc, diff --git a/tests/libtest/lib1500.c b/tests/libtest/lib1500.c index 3659d55c9..784bdb2a2 100644 --- a/tests/libtest/lib1500.c +++ b/tests/libtest/lib1500.c @@ -22,8 +22,8 @@ #include "test.h" #include "testutil.h" -#include "curl_warnless.h" -#include "curl_memdebug.h" +#include "warnless.h" +#include "memdebug.h" #define TEST_HANG_TIMEOUT 60 * 1000 diff --git a/tests/libtest/lib1501.c b/tests/libtest/lib1501.c index b78f94df5..01a382e82 100644 --- a/tests/libtest/lib1501.c +++ b/tests/libtest/lib1501.c @@ -24,8 +24,8 @@ #include #include "testutil.h" -#include "curl_warnless.h" -#include "curl_memdebug.h" +#include "warnless.h" +#include "memdebug.h" #define TEST_HANG_TIMEOUT 30 * 1000 diff --git a/tests/libtest/lib1502.c b/tests/libtest/lib1502.c index 2368eec45..2b50c4733 100644 --- a/tests/libtest/lib1502.c +++ b/tests/libtest/lib1502.c @@ -34,8 +34,8 @@ #endif #include "testutil.h" -#include "curl_warnless.h" -#include "curl_memdebug.h" +#include "warnless.h" +#include "memdebug.h" #define TEST_HANG_TIMEOUT 60 * 1000 diff --git a/tests/libtest/lib500.c b/tests/libtest/lib500.c index e782d1a3e..dda1d7f42 100644 --- a/tests/libtest/lib500.c +++ b/tests/libtest/lib500.c @@ -22,7 +22,7 @@ #include "test.h" #include "testtrace.h" -#include "curl_memdebug.h" +#include "memdebug.h" #ifdef LIB585 diff --git a/tests/libtest/lib501.c b/tests/libtest/lib501.c index 9e5d06875..26275f977 100644 --- a/tests/libtest/lib501.c +++ b/tests/libtest/lib501.c @@ -21,7 +21,7 @@ ***************************************************************************/ #include "test.h" -#include "curl_memdebug.h" +#include "memdebug.h" int test(char *URL) { diff --git a/tests/libtest/lib502.c b/tests/libtest/lib502.c index f2adf274e..554583ae2 100644 --- a/tests/libtest/lib502.c +++ b/tests/libtest/lib502.c @@ -22,8 +22,8 @@ #include "test.h" #include "testutil.h" -#include "curl_warnless.h" -#include "curl_memdebug.h" +#include "warnless.h" +#include "memdebug.h" #define TEST_HANG_TIMEOUT 60 * 1000 diff --git a/tests/libtest/lib503.c b/tests/libtest/lib503.c index 195149329..50277f7d3 100644 --- a/tests/libtest/lib503.c +++ b/tests/libtest/lib503.c @@ -22,8 +22,8 @@ #include "test.h" #include "testutil.h" -#include "curl_warnless.h" -#include "curl_memdebug.h" +#include "warnless.h" +#include "memdebug.h" #define TEST_HANG_TIMEOUT 60 * 1000 diff --git a/tests/libtest/lib504.c b/tests/libtest/lib504.c index 1e2584f3a..358fc98dc 100644 --- a/tests/libtest/lib504.c +++ b/tests/libtest/lib504.c @@ -22,8 +22,8 @@ #include "test.h" #include "testutil.h" -#include "curl_warnless.h" -#include "curl_memdebug.h" +#include "warnless.h" +#include "memdebug.h" #define TEST_HANG_TIMEOUT 60 * 1000 diff --git a/tests/libtest/lib505.c b/tests/libtest/lib505.c index 6ff4e8478..99b3a0afe 100644 --- a/tests/libtest/lib505.c +++ b/tests/libtest/lib505.c @@ -25,7 +25,7 @@ #include #endif -#include "curl_memdebug.h" +#include "memdebug.h" /* * This example shows an FTP upload, with a rename of the file just after diff --git a/tests/libtest/lib506.c b/tests/libtest/lib506.c index 0b4645670..4477eaa50 100644 --- a/tests/libtest/lib506.c +++ b/tests/libtest/lib506.c @@ -23,7 +23,7 @@ #include -#include "curl_memdebug.h" +#include "memdebug.h" static const char *HOSTHEADER = "Host: www.host.foo.com"; static const char *JAR = "log/jar506"; diff --git a/tests/libtest/lib507.c b/tests/libtest/lib507.c index a27bf99f1..87c21defb 100644 --- a/tests/libtest/lib507.c +++ b/tests/libtest/lib507.c @@ -22,8 +22,8 @@ #include "test.h" #include "testutil.h" -#include "curl_warnless.h" -#include "curl_memdebug.h" +#include "warnless.h" +#include "memdebug.h" #define TEST_HANG_TIMEOUT 60 * 1000 diff --git a/tests/libtest/lib508.c b/tests/libtest/lib508.c index c8fada3de..1aca064e9 100644 --- a/tests/libtest/lib508.c +++ b/tests/libtest/lib508.c @@ -21,7 +21,7 @@ ***************************************************************************/ #include "test.h" -#include "curl_memdebug.h" +#include "memdebug.h" static char data[]="this is what we post to the silly web server\n"; diff --git a/tests/libtest/lib510.c b/tests/libtest/lib510.c index 0ec8b1e58..8278631c1 100644 --- a/tests/libtest/lib510.c +++ b/tests/libtest/lib510.c @@ -21,7 +21,7 @@ ***************************************************************************/ #include "test.h" -#include "curl_memdebug.h" +#include "memdebug.h" static const char *post[]={ "one", diff --git a/tests/libtest/lib511.c b/tests/libtest/lib511.c index f90804b2a..6be2d2f76 100644 --- a/tests/libtest/lib511.c +++ b/tests/libtest/lib511.c @@ -21,7 +21,7 @@ ***************************************************************************/ #include "test.h" -#include "curl_memdebug.h" +#include "memdebug.h" int test(char *URL) { diff --git a/tests/libtest/lib512.c b/tests/libtest/lib512.c index 364744481..19da18b4f 100644 --- a/tests/libtest/lib512.c +++ b/tests/libtest/lib512.c @@ -21,7 +21,7 @@ ***************************************************************************/ #include "test.h" -#include "curl_memdebug.h" +#include "memdebug.h" /* Test case code based on source in a bug report filed by James Bursa on 28 Apr 2004 */ diff --git a/tests/libtest/lib513.c b/tests/libtest/lib513.c index efec49b0a..c013ac258 100644 --- a/tests/libtest/lib513.c +++ b/tests/libtest/lib513.c @@ -21,7 +21,7 @@ ***************************************************************************/ #include "test.h" -#include "curl_memdebug.h" +#include "memdebug.h" static size_t read_callback(void *ptr, size_t size, size_t nmemb, void *userp) { diff --git a/tests/libtest/lib514.c b/tests/libtest/lib514.c index 7e0066ce5..953e90dff 100644 --- a/tests/libtest/lib514.c +++ b/tests/libtest/lib514.c @@ -21,7 +21,7 @@ ***************************************************************************/ #include "test.h" -#include "curl_memdebug.h" +#include "memdebug.h" int test(char *URL) { diff --git a/tests/libtest/lib515.c b/tests/libtest/lib515.c index e403840de..4e96c4a8d 100644 --- a/tests/libtest/lib515.c +++ b/tests/libtest/lib515.c @@ -21,7 +21,7 @@ ***************************************************************************/ #include "test.h" -#include "curl_memdebug.h" +#include "memdebug.h" int test(char *URL) { diff --git a/tests/libtest/lib516.c b/tests/libtest/lib516.c index 96ee44114..a9590948d 100644 --- a/tests/libtest/lib516.c +++ b/tests/libtest/lib516.c @@ -21,7 +21,7 @@ ***************************************************************************/ #include "test.h" -#include "curl_memdebug.h" +#include "memdebug.h" int test(char *URL) { diff --git a/tests/libtest/lib517.c b/tests/libtest/lib517.c index e728acfa2..ba49ec41e 100644 --- a/tests/libtest/lib517.c +++ b/tests/libtest/lib517.c @@ -21,7 +21,7 @@ ***************************************************************************/ #include "test.h" -#include "curl_memdebug.h" +#include "memdebug.h" static const char * const dates[]={ "Sun, 06 Nov 1994 08:49:37 GMT", diff --git a/tests/libtest/lib518.c b/tests/libtest/lib518.c index f5b4eb67a..23f7f17c6 100644 --- a/tests/libtest/lib518.c +++ b/tests/libtest/lib518.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2013, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2011, 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 @@ -31,8 +31,8 @@ #include #endif -#include "curl_warnless.h" -#include "curl_memdebug.h" +#include "warnless.h" +#include "memdebug.h" #ifndef FD_SETSIZE #error "this test requires FD_SETSIZE" @@ -386,7 +386,7 @@ static int rlimit(int keep_open) * when using select() instead of poll() we cannot test * libcurl functionality with a socket number equal or * greater than FD_SETSIZE. In any case, macro VERIFY_SOCK - * in lib/curl_select.c enforces this check and protects libcurl + * in lib/select.c enforces this check and protects libcurl * from a possible crash. The effect of this protection * is that test 518 will always fail, since the actual * call to select() never takes place. We skip test 518 diff --git a/tests/libtest/lib519.c b/tests/libtest/lib519.c index 43efc1753..b720c8fee 100644 --- a/tests/libtest/lib519.c +++ b/tests/libtest/lib519.c @@ -21,7 +21,7 @@ ***************************************************************************/ #include "test.h" -#include "curl_memdebug.h" +#include "memdebug.h" int test(char *URL) { diff --git a/tests/libtest/lib520.c b/tests/libtest/lib520.c index 6d70411c4..9ffaa4f92 100644 --- a/tests/libtest/lib520.c +++ b/tests/libtest/lib520.c @@ -21,7 +21,7 @@ ***************************************************************************/ #include "test.h" -#include "curl_memdebug.h" +#include "memdebug.h" int test(char *URL) { diff --git a/tests/libtest/lib521.c b/tests/libtest/lib521.c index 57d938b99..93c306864 100644 --- a/tests/libtest/lib521.c +++ b/tests/libtest/lib521.c @@ -21,7 +21,7 @@ ***************************************************************************/ #include "test.h" -#include "curl_memdebug.h" +#include "memdebug.h" int test(char *URL) { diff --git a/tests/libtest/lib523.c b/tests/libtest/lib523.c index e7004e20f..0fdc83db6 100644 --- a/tests/libtest/lib523.c +++ b/tests/libtest/lib523.c @@ -21,7 +21,7 @@ ***************************************************************************/ #include "test.h" -#include "curl_memdebug.h" +#include "memdebug.h" int test(char *URL) { diff --git a/tests/libtest/lib524.c b/tests/libtest/lib524.c index 45aee7fb8..6f56df9b0 100644 --- a/tests/libtest/lib524.c +++ b/tests/libtest/lib524.c @@ -21,7 +21,7 @@ ***************************************************************************/ #include "test.h" -#include "curl_memdebug.h" +#include "memdebug.h" int test(char *URL) { diff --git a/tests/libtest/lib525.c b/tests/libtest/lib525.c index ce7d559d4..ca128cb9c 100644 --- a/tests/libtest/lib525.c +++ b/tests/libtest/lib525.c @@ -24,8 +24,8 @@ #include #include "testutil.h" -#include "curl_warnless.h" -#include "curl_memdebug.h" +#include "warnless.h" +#include "memdebug.h" #define TEST_HANG_TIMEOUT 60 * 1000 diff --git a/tests/libtest/lib526.c b/tests/libtest/lib526.c index a89442684..9db04dba7 100644 --- a/tests/libtest/lib526.c +++ b/tests/libtest/lib526.c @@ -43,8 +43,8 @@ #include #include "testutil.h" -#include "curl_warnless.h" -#include "curl_memdebug.h" +#include "warnless.h" +#include "memdebug.h" #define TEST_HANG_TIMEOUT 60 * 1000 diff --git a/tests/libtest/lib530.c b/tests/libtest/lib530.c index ba933b335..ad84ff8a5 100644 --- a/tests/libtest/lib530.c +++ b/tests/libtest/lib530.c @@ -22,8 +22,8 @@ #include "test.h" #include "testutil.h" -#include "curl_warnless.h" -#include "curl_memdebug.h" +#include "warnless.h" +#include "memdebug.h" #define TEST_HANG_TIMEOUT 60 * 1000 diff --git a/tests/libtest/lib533.c b/tests/libtest/lib533.c index 6b2671b51..fdc18a1eb 100644 --- a/tests/libtest/lib533.c +++ b/tests/libtest/lib533.c @@ -26,8 +26,8 @@ #include #include "testutil.h" -#include "curl_warnless.h" -#include "curl_memdebug.h" +#include "warnless.h" +#include "memdebug.h" #define TEST_HANG_TIMEOUT 60 * 1000 diff --git a/tests/libtest/lib536.c b/tests/libtest/lib536.c index 1f7a798d1..e3ae402b7 100644 --- a/tests/libtest/lib536.c +++ b/tests/libtest/lib536.c @@ -24,8 +24,8 @@ #include #include "testutil.h" -#include "curl_warnless.h" -#include "curl_memdebug.h" +#include "warnless.h" +#include "memdebug.h" #define TEST_HANG_TIMEOUT 60 * 1000 diff --git a/tests/libtest/lib537.c b/tests/libtest/lib537.c index 1c6210e84..24d252235 100644 --- a/tests/libtest/lib537.c +++ b/tests/libtest/lib537.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2013, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2011, 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 @@ -31,8 +31,8 @@ #include #endif -#include "curl_warnless.h" -#include "curl_memdebug.h" +#include "warnless.h" +#include "memdebug.h" #if !defined(HAVE_POLL_FINE) && \ !defined(USE_WINSOCK) && \ @@ -389,7 +389,7 @@ static int rlimit(int keep_open) * when using select() instead of poll() we cannot test * libcurl functionality with a socket number equal or * greater than FD_SETSIZE. In any case, macro VERIFY_SOCK - * in lib/curl_select.c enforces this check and protects libcurl + * in lib/select.c enforces this check and protects libcurl * from a possible crash. The effect of this protection * is that test 537 will always fail, since the actual * call to select() never takes place. We skip test 537 diff --git a/tests/libtest/lib539.c b/tests/libtest/lib539.c index 2e6396a13..923893fb2 100644 --- a/tests/libtest/lib539.c +++ b/tests/libtest/lib539.c @@ -21,7 +21,7 @@ ***************************************************************************/ #include "test.h" -#include "curl_memdebug.h" +#include "memdebug.h" int test(char *URL) { diff --git a/tests/libtest/lib540.c b/tests/libtest/lib540.c index a36693de3..ac0ebe60b 100644 --- a/tests/libtest/lib540.c +++ b/tests/libtest/lib540.c @@ -35,8 +35,8 @@ #endif #include "testutil.h" -#include "curl_warnless.h" -#include "curl_memdebug.h" +#include "warnless.h" +#include "memdebug.h" #define TEST_HANG_TIMEOUT 60 * 1000 diff --git a/tests/libtest/lib541.c b/tests/libtest/lib541.c index 22388bdab..5fe8dd8ad 100644 --- a/tests/libtest/lib541.c +++ b/tests/libtest/lib541.c @@ -25,7 +25,7 @@ #include #endif -#include "curl_memdebug.h" +#include "memdebug.h" /* * Two FTP uploads, the second with no content sent. diff --git a/tests/libtest/lib542.c b/tests/libtest/lib542.c index a5cb3e204..84f493f3e 100644 --- a/tests/libtest/lib542.c +++ b/tests/libtest/lib542.c @@ -25,7 +25,7 @@ #include #endif -#include "curl_memdebug.h" +#include "memdebug.h" /* * FTP get with NOBODY but no HEADER diff --git a/tests/libtest/lib543.c b/tests/libtest/lib543.c index 35e32e6f4..b4a31ca9a 100644 --- a/tests/libtest/lib543.c +++ b/tests/libtest/lib543.c @@ -23,7 +23,7 @@ #include "test.h" -#include "curl_memdebug.h" +#include "memdebug.h" int test(char *URL) { diff --git a/tests/libtest/lib544.c b/tests/libtest/lib544.c index adb0345fb..b766187f2 100644 --- a/tests/libtest/lib544.c +++ b/tests/libtest/lib544.c @@ -21,7 +21,7 @@ ***************************************************************************/ #include "test.h" -#include "curl_memdebug.h" +#include "memdebug.h" static char teststring[] = #ifdef CURL_DOES_CONVERSIONS diff --git a/tests/libtest/lib547.c b/tests/libtest/lib547.c index 58d10824d..c82bc3f23 100644 --- a/tests/libtest/lib547.c +++ b/tests/libtest/lib547.c @@ -26,7 +26,7 @@ #include "test.h" -#include "curl_memdebug.h" +#include "memdebug.h" #ifdef CURL_DOES_CONVERSIONS /* ASCII representation with escape sequences for non-ASCII platforms */ diff --git a/tests/libtest/lib549.c b/tests/libtest/lib549.c index 8856ef174..a1568c88f 100644 --- a/tests/libtest/lib549.c +++ b/tests/libtest/lib549.c @@ -26,7 +26,7 @@ #include "test.h" -#include "curl_memdebug.h" +#include "memdebug.h" int test(char *URL) { diff --git a/tests/libtest/lib552.c b/tests/libtest/lib552.c index 1d3278fa8..2cc942ad4 100644 --- a/tests/libtest/lib552.c +++ b/tests/libtest/lib552.c @@ -25,8 +25,8 @@ #include "test.h" -#include "curl_warnless.h" -#include "curl_memdebug.h" +#include "warnless.h" +#include "memdebug.h" struct data { char trace_ascii; /* 1 or 0 */ diff --git a/tests/libtest/lib553.c b/tests/libtest/lib553.c index ce96cebbb..cb1cefd5e 100644 --- a/tests/libtest/lib553.c +++ b/tests/libtest/lib553.c @@ -26,7 +26,7 @@ #include "test.h" -#include "curl_memdebug.h" +#include "memdebug.h" #define POSTLEN 40960 diff --git a/tests/libtest/lib554.c b/tests/libtest/lib554.c index 1c90b9b0b..0596f3ef1 100644 --- a/tests/libtest/lib554.c +++ b/tests/libtest/lib554.c @@ -21,7 +21,7 @@ ***************************************************************************/ #include "test.h" -#include "curl_memdebug.h" +#include "memdebug.h" static char data[]= #ifdef CURL_DOES_CONVERSIONS diff --git a/tests/libtest/lib555.c b/tests/libtest/lib555.c index 3c4205179..49a81bf57 100644 --- a/tests/libtest/lib555.c +++ b/tests/libtest/lib555.c @@ -30,8 +30,8 @@ #include "test.h" #include "testutil.h" -#include "curl_warnless.h" -#include "curl_memdebug.h" +#include "warnless.h" +#include "memdebug.h" #define TEST_HANG_TIMEOUT 60 * 1000 diff --git a/tests/libtest/lib556.c b/tests/libtest/lib556.c index 1eb2e1562..98062209f 100644 --- a/tests/libtest/lib556.c +++ b/tests/libtest/lib556.c @@ -21,7 +21,7 @@ ***************************************************************************/ #include "test.h" -#include "curl_memdebug.h" +#include "memdebug.h" /* For Windows, mainly (may be moved in a config file?) */ #ifndef STDIN_FILENO diff --git a/tests/libtest/lib557.c b/tests/libtest/lib557.c index 721338867..dc3bcae86 100644 --- a/tests/libtest/lib557.c +++ b/tests/libtest/lib557.c @@ -29,7 +29,7 @@ #include -#include "curl_memdebug.h" +#include "memdebug.h" #if (CURL_SIZEOF_CURL_OFF_T > CURL_SIZEOF_LONG) diff --git a/tests/libtest/lib560.c b/tests/libtest/lib560.c index 90c07323b..e8be1c7bd 100644 --- a/tests/libtest/lib560.c +++ b/tests/libtest/lib560.c @@ -22,8 +22,8 @@ #include "test.h" #include "testutil.h" -#include "curl_warnless.h" -#include "curl_memdebug.h" +#include "warnless.h" +#include "memdebug.h" #define TEST_HANG_TIMEOUT 60 * 1000 diff --git a/tests/libtest/lib562.c b/tests/libtest/lib562.c index b00bd83d1..a5f0ea534 100644 --- a/tests/libtest/lib562.c +++ b/tests/libtest/lib562.c @@ -25,7 +25,7 @@ #include #endif -#include "curl_memdebug.h" +#include "memdebug.h" /* * From "KNOWN_BUGS" April 2009: diff --git a/tests/libtest/lib564.c b/tests/libtest/lib564.c index 84d0a20b6..ed00e1bf6 100644 --- a/tests/libtest/lib564.c +++ b/tests/libtest/lib564.c @@ -24,8 +24,8 @@ #include #include "testutil.h" -#include "curl_warnless.h" -#include "curl_memdebug.h" +#include "warnless.h" +#include "memdebug.h" #define TEST_HANG_TIMEOUT 60 * 1000 diff --git a/tests/libtest/lib566.c b/tests/libtest/lib566.c index f95872c5a..ba839d65f 100644 --- a/tests/libtest/lib566.c +++ b/tests/libtest/lib566.c @@ -21,7 +21,7 @@ ***************************************************************************/ #include "test.h" -#include "curl_memdebug.h" +#include "memdebug.h" int test(char *URL) { diff --git a/tests/libtest/lib567.c b/tests/libtest/lib567.c index 8b698394e..573529cd8 100644 --- a/tests/libtest/lib567.c +++ b/tests/libtest/lib567.c @@ -21,7 +21,7 @@ ***************************************************************************/ #include "test.h" -#include "curl_memdebug.h" +#include "memdebug.h" /* * Test a simple OPTIONS request with a custom header diff --git a/tests/libtest/lib568.c b/tests/libtest/lib568.c index 3e69a68f0..4b15821f2 100644 --- a/tests/libtest/lib568.c +++ b/tests/libtest/lib568.c @@ -30,7 +30,7 @@ #include -#include "curl_memdebug.h" +#include "memdebug.h" /* build request url */ static char *suburl(const char *base, int i) diff --git a/tests/libtest/lib569.c b/tests/libtest/lib569.c index c7635f19a..a434d7459 100644 --- a/tests/libtest/lib569.c +++ b/tests/libtest/lib569.c @@ -23,7 +23,7 @@ #include -#include "curl_memdebug.h" +#include "memdebug.h" /* build request url */ static char *suburl(const char *base, int i) diff --git a/tests/libtest/lib570.c b/tests/libtest/lib570.c index b9a105f08..a9fac9915 100644 --- a/tests/libtest/lib570.c +++ b/tests/libtest/lib570.c @@ -23,7 +23,7 @@ #include -#include "curl_memdebug.h" +#include "memdebug.h" /* build request url */ static char *suburl(const char *base, int i) diff --git a/tests/libtest/lib571.c b/tests/libtest/lib571.c index 977c7723e..ba0aa1ce4 100644 --- a/tests/libtest/lib571.c +++ b/tests/libtest/lib571.c @@ -39,8 +39,8 @@ #include -#include "curl_warnless.h" -#include "curl_memdebug.h" +#include "warnless.h" +#include "memdebug.h" #define RTP_PKT_CHANNEL(p) ((int)((unsigned char)((p)[1]))) diff --git a/tests/libtest/lib572.c b/tests/libtest/lib572.c index 78e5c804c..3df4d036a 100644 --- a/tests/libtest/lib572.c +++ b/tests/libtest/lib572.c @@ -30,7 +30,7 @@ #include -#include "curl_memdebug.h" +#include "memdebug.h" /* build request url */ static char *suburl(const char *base, int i) diff --git a/tests/libtest/lib573.c b/tests/libtest/lib573.c index 34fdb99bd..b49d26a5d 100644 --- a/tests/libtest/lib573.c +++ b/tests/libtest/lib573.c @@ -23,8 +23,8 @@ #include "testtrace.h" #include "testutil.h" -#include "curl_warnless.h" -#include "curl_memdebug.h" +#include "warnless.h" +#include "memdebug.h" #define TEST_HANG_TIMEOUT 60 * 1000 diff --git a/tests/libtest/lib574.c b/tests/libtest/lib574.c index 4f77ae394..afb2bceae 100644 --- a/tests/libtest/lib574.c +++ b/tests/libtest/lib574.c @@ -21,7 +21,7 @@ ***************************************************************************/ #include "test.h" -#include "curl_memdebug.h" +#include "memdebug.h" static int new_fnmatch(const char *pattern, const char *string) { diff --git a/tests/libtest/lib575.c b/tests/libtest/lib575.c index 74d098ee1..942df68c5 100644 --- a/tests/libtest/lib575.c +++ b/tests/libtest/lib575.c @@ -24,8 +24,8 @@ #include #include "testutil.h" -#include "curl_warnless.h" -#include "curl_memdebug.h" +#include "warnless.h" +#include "memdebug.h" #define TEST_HANG_TIMEOUT 60 * 1000 diff --git a/tests/libtest/lib576.c b/tests/libtest/lib576.c index 7ee86c68c..61bb61325 100644 --- a/tests/libtest/lib576.c +++ b/tests/libtest/lib576.c @@ -22,7 +22,7 @@ #include "test.h" #include "testutil.h" -#include "curl_memdebug.h" +#include "memdebug.h" typedef struct { int remains; diff --git a/tests/libtest/lib578.c b/tests/libtest/lib578.c index eee42663b..a39b31772 100644 --- a/tests/libtest/lib578.c +++ b/tests/libtest/lib578.c @@ -21,7 +21,7 @@ ***************************************************************************/ #include "test.h" -#include "curl_memdebug.h" +#include "memdebug.h" /* The size of data should be kept below MAX_INITIAL_POST_SIZE! */ static char data[]="this is a short string.\n"; diff --git a/tests/libtest/lib579.c b/tests/libtest/lib579.c index e6c0e6f6e..c5cf603bb 100644 --- a/tests/libtest/lib579.c +++ b/tests/libtest/lib579.c @@ -21,7 +21,7 @@ ***************************************************************************/ #include "test.h" -#include "curl_memdebug.h" +#include "memdebug.h" static const char * const post[]={ "one", diff --git a/tests/libtest/lib582.c b/tests/libtest/lib582.c index bd88e43aa..952efb4ed 100644 --- a/tests/libtest/lib582.c +++ b/tests/libtest/lib582.c @@ -24,8 +24,8 @@ #include #include "testutil.h" -#include "curl_warnless.h" -#include "curl_memdebug.h" +#include "warnless.h" +#include "memdebug.h" #define TEST_HANG_TIMEOUT 60 * 1000 diff --git a/tests/libtest/lib583.c b/tests/libtest/lib583.c index 4ef9e5a35..ad5a5cea7 100644 --- a/tests/libtest/lib583.c +++ b/tests/libtest/lib583.c @@ -28,7 +28,7 @@ #include -#include "curl_memdebug.h" +#include "memdebug.h" int test(char *URL) { diff --git a/tests/libtest/lib586.c b/tests/libtest/lib586.c index 34f093967..2cf04fe85 100644 --- a/tests/libtest/lib586.c +++ b/tests/libtest/lib586.c @@ -23,7 +23,7 @@ #include -#include "curl_memdebug.h" +#include "memdebug.h" #define THREADS 2 diff --git a/tests/libtest/lib590.c b/tests/libtest/lib590.c index 26e88731c..68603c65e 100644 --- a/tests/libtest/lib590.c +++ b/tests/libtest/lib590.c @@ -34,7 +34,7 @@ - Start the request */ -#include "curl_memdebug.h" +#include "memdebug.h" int test(char *URL) { diff --git a/tests/libtest/lib591.c b/tests/libtest/lib591.c index 48648fb24..5cd4644e3 100644 --- a/tests/libtest/lib591.c +++ b/tests/libtest/lib591.c @@ -30,8 +30,8 @@ #include #include "testutil.h" -#include "curl_warnless.h" -#include "curl_memdebug.h" +#include "warnless.h" +#include "memdebug.h" #define TEST_HANG_TIMEOUT 60 * 1000 diff --git a/tests/libtest/lib597.c b/tests/libtest/lib597.c index aae6500ae..a27cefd5b 100644 --- a/tests/libtest/lib597.c +++ b/tests/libtest/lib597.c @@ -26,8 +26,8 @@ #endif #include "testutil.h" -#include "curl_warnless.h" -#include "curl_memdebug.h" +#include "warnless.h" +#include "memdebug.h" #define TEST_HANG_TIMEOUT 5 * 1000 diff --git a/tests/libtest/lib598.c b/tests/libtest/lib598.c index 53fabd168..e9c1ad776 100644 --- a/tests/libtest/lib598.c +++ b/tests/libtest/lib598.c @@ -21,7 +21,7 @@ ***************************************************************************/ #include "test.h" -#include "curl_memdebug.h" +#include "memdebug.h" int test(char *URL) { diff --git a/tests/libtest/lib599.c b/tests/libtest/lib599.c index 6de586932..6b092677a 100644 --- a/tests/libtest/lib599.c +++ b/tests/libtest/lib599.c @@ -21,7 +21,7 @@ ***************************************************************************/ #include "test.h" -#include "curl_memdebug.h" +#include "memdebug.h" static int progress_callback(void *clientp, double dltotal, double dlnow, double ultotal, double ulnow) diff --git a/tests/libtest/libauthretry.c b/tests/libtest/libauthretry.c index c5cc6cfd8..95761325a 100644 --- a/tests/libtest/libauthretry.c +++ b/tests/libtest/libauthretry.c @@ -25,8 +25,8 @@ */ #include "test.h" -#include "curl_strequal.h" -#include "curl_memdebug.h" +#include "strequal.h" +#include "memdebug.h" static CURLcode send_request(CURL *curl, const char *url, int seq, long auth_scheme, const char *userpwd) diff --git a/tests/libtest/libntlmconnect.c b/tests/libtest/libntlmconnect.c index c7cc93350..b540ebf58 100644 --- a/tests/libtest/libntlmconnect.c +++ b/tests/libtest/libntlmconnect.c @@ -27,8 +27,8 @@ #include #include "testutil.h" -#include "curl_warnless.h" -#include "curl_memdebug.h" +#include "warnless.h" +#include "memdebug.h" #define TEST_HANG_TIMEOUT 5 * 1000 #define MAX_EASY_HANDLES 3 diff --git a/tests/libtest/sethostname.c b/tests/libtest/sethostname.c index 9da6a6730..f131fe9fb 100644 --- a/tests/libtest/sethostname.c +++ b/tests/libtest/sethostname.c @@ -19,7 +19,7 @@ * KIND, either express or implied. * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #include "sethostname.h" diff --git a/tests/libtest/test.h b/tests/libtest/test.h index b45e72112..fcc91ad8b 100644 --- a/tests/libtest/test.h +++ b/tests/libtest/test.h @@ -20,14 +20,14 @@ * ***************************************************************************/ -/* Now include the curl_setup.h file from libcurl's private libdir (the - source version, but that might include "curl_config.h" from the build - dir so we need both of them in the include path), so that we get good - in-depth knowledge about the system we're building this on */ +/* Now include the setup.h file from libcurl's private libdir (the source + version, but that might include "curl_config.h" from the build dir so we + need both of them in the include path), so that we get good in-depth + knowledge about the system we're building this on */ #define CURL_NO_OLDIES -#include "curl_setup.h" +#include "setup.h" #include @@ -37,7 +37,7 @@ #endif #ifdef TPF -# include "curl_select.h" +# include "select.h" #endif #define test_setopt(A,B,C) \ diff --git a/tests/libtest/testtrace.c b/tests/libtest/testtrace.c index 0f74d8d9f..c977d2105 100644 --- a/tests/libtest/testtrace.c +++ b/tests/libtest/testtrace.c @@ -27,7 +27,7 @@ #include "testutil.h" #include "testtrace.h" -#include "curl_memdebug.h" +#include "memdebug.h" struct libtest_trace_cfg libtest_debug_config; diff --git a/tests/libtest/testutil.c b/tests/libtest/testutil.c index 456d799e7..3ad18c987 100644 --- a/tests/libtest/testutil.c +++ b/tests/libtest/testutil.c @@ -19,10 +19,10 @@ * KIND, either express or implied. * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" #include "testutil.h" -#include "curl_memdebug.h" +#include "memdebug.h" #if defined(WIN32) && !defined(MSDOS) diff --git a/tests/libtest/testutil.h b/tests/libtest/testutil.h index a236970a6..0c6be2fc4 100644 --- a/tests/libtest/testutil.h +++ b/tests/libtest/testutil.h @@ -21,7 +21,7 @@ * KIND, either express or implied. * ***************************************************************************/ -#include "curl_setup.h" +#include "setup.h" struct timeval tutil_tvnow(void); diff --git a/tests/mem-include-scan.pl b/tests/mem-include-scan.pl index 8f599ae0a..676df25e9 100644 --- a/tests/mem-include-scan.pl +++ b/tests/mem-include-scan.pl @@ -46,7 +46,7 @@ sub scanfile { if($_ =~ /(free|alloc|strdup)\(/) { $memfunc++; } - elsif($_ =~ /^ *# *include \"curl_memdebug.h\"/) { + elsif($_ =~ /^ *# *include \"memdebug.h\"/) { $memdebug++; } elsif($_ =~ /^ *# *include \"curl_memory.h\"/) { @@ -70,7 +70,7 @@ sub scanfile { } else { if(!$memdebug) { - print STDERR "$file doesn't include \"curl_memdebug.h\"!\n"; + print STDERR "$file doesn't include \"memdebug.h\"!\n"; } if(!$curlmem) { print STDERR "$file doesn't include \"curl_memory.h\"!\n"; diff --git a/tests/memanalyze.pl b/tests/memanalyze.pl index 5f5bdfc2f..bf5393365 100755 --- a/tests/memanalyze.pl +++ b/tests/memanalyze.pl @@ -6,7 +6,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2013, Daniel Stenberg, , et al. +# Copyright (C) 1998 - 2011, 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 @@ -23,9 +23,9 @@ # # Example input: # -# MEM curl_mprintf.c:1094 malloc(32) = e5718 -# MEM curl_mprintf.c:1103 realloc(e5718, 64) = e6118 -# MEM curl_sendf.c:232 free(f6520) +# MEM mprintf.c:1094 malloc(32) = e5718 +# MEM mprintf.c:1103 realloc(e5718, 64) = e6118 +# MEM sendf.c:232 free(f6520) my $mallocs=0; my $callocs=0; @@ -224,7 +224,7 @@ while() { print "Not recognized input line: $function\n"; } } - # FD curl_url.c:1282 socket() = 5 + # FD url.c:1282 socket() = 5 elsif($_ =~ /^FD ([^ ]*):(\d*) (.*)/) { # generic match for the filename+linenumber $source = $1; @@ -259,7 +259,7 @@ while() { } } } - # FILE curl_url.c:1282 fopen("blabla") = 0x5ddd + # FILE url.c:1282 fopen("blabla") = 0x5ddd elsif($_ =~ /^FILE ([^ ]*):(\d*) (.*)/) { # generic match for the filename+linenumber $source = $1; @@ -287,12 +287,12 @@ while() { } } } - # GETNAME curl_url.c:1901 getnameinfo() + # GETNAME url.c:1901 getnameinfo() elsif($_ =~ /^GETNAME ([^ ]*):(\d*) (.*)/) { # not much to do } - # ADDR curl_url.c:1282 getaddrinfo() = 0x5ddd + # ADDR url.c:1282 getaddrinfo() = 0x5ddd elsif($_ =~ /^ADDR ([^ ]*):(\d*) (.*)/) { # generic match for the filename+linenumber $source = $1; diff --git a/tests/server/CMakeLists.txt b/tests/server/CMakeLists.txt index fc07b61d9..0401df215 100644 --- a/tests/server/CMakeLists.txt +++ b/tests/server/CMakeLists.txt @@ -5,8 +5,8 @@ function(SETUP_EXECUTABLE TEST_NAME) # ARGN are the files in the test string(TOUPPER ${TEST_NAME} UPPER_TEST_NAME) 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" ) if(CURL_USE_ARES) @@ -56,16 +56,16 @@ endforeach() # SET(useful # getpart.c getpart.h -# ${CURL_SOURCE_DIR}/lib/curl_strequal.c -# ${CURL_SOURCE_DIR}/lib/curl_base64.c -# ${CURL_SOURCE_DIR}/lib/curl_mprintf.c -# ${CURL_SOURCE_DIR}/lib/curl_memdebug.c -# ${CURL_SOURCE_DIR}/lib/curl_timeval.c +# ${CURL_SOURCE_DIR}/lib/strequal.c +# ${CURL_SOURCE_DIR}/lib/base64.c +# ${CURL_SOURCE_DIR}/lib/mprintf.c +# ${CURL_SOURCE_DIR}/lib/memdebug.c +# ${CURL_SOURCE_DIR}/lib/timeval.c # ) # SETUP_EXECUTABLE(sws sws.c util.c util.h ${useful}) # SETUP_EXECUTABLE(resolve resolve.c util.c util.h ${useful}) -# SETUP_EXECUTABLE(sockfilt sockfilt.c util.c util.h ${useful} ${CURL_SOURCE_DIR}/lib/curl_inet_pton.c) +# SETUP_EXECUTABLE(sockfilt sockfilt.c util.c util.h ${useful} ${CURL_SOURCE_DIR}/lib/inet_pton.c) # SETUP_EXECUTABLE(getpart testpart.c ${useful}) -# SETUP_EXECUTABLE(tftpd tftpd.c util.c util.h ${useful} server_tftp.h) +# SETUP_EXECUTABLE(tftpd tftpd.c util.c util.h ${useful} tftp.h) diff --git a/tests/server/Makefile.inc b/tests/server/Makefile.inc index b0c32bdf2..4a12ea872 100644 --- a/tests/server/Makefile.inc +++ b/tests/server/Makefile.inc @@ -1,29 +1,29 @@ noinst_PROGRAMS = getpart resolve rtspd sockfilt sws tftpd fake_ntlm CURLX_SRCS = \ - $(top_srcdir)/lib/curl_mprintf.c \ - $(top_srcdir)/lib/curl_nonblock.c \ - $(top_srcdir)/lib/curl_strequal.c \ - $(top_srcdir)/lib/curl_strtoofft.c \ - $(top_srcdir)/lib/curl_timeval.c \ - $(top_srcdir)/lib/curl_warnless.c + $(top_srcdir)/lib/mprintf.c \ + $(top_srcdir)/lib/nonblock.c \ + $(top_srcdir)/lib/strequal.c \ + $(top_srcdir)/lib/strtoofft.c \ + $(top_srcdir)/lib/timeval.c \ + $(top_srcdir)/lib/warnless.c CURLX_HDRS = \ $(top_srcdir)/lib/curlx.h \ - $(top_srcdir)/lib/curl_nonblock.h \ - $(top_srcdir)/lib/curl_strequal.h \ - $(top_srcdir)/lib/curl_strtoofft.h \ - $(top_srcdir)/lib/curl_timeval.h \ - $(top_srcdir)/lib/curl_warnless.h + $(top_srcdir)/lib/nonblock.h \ + $(top_srcdir)/lib/strequal.h \ + $(top_srcdir)/lib/strtoofft.h \ + $(top_srcdir)/lib/timeval.h \ + $(top_srcdir)/lib/warnless.h USEFUL = \ getpart.c \ getpart.h \ server_setup.h \ - $(top_srcdir)/lib/curl_base64.c \ + $(top_srcdir)/lib/base64.c \ $(top_srcdir)/lib/curl_base64.h \ - $(top_srcdir)/lib/curl_memdebug.c \ - $(top_srcdir)/lib/curl_memdebug.h + $(top_srcdir)/lib/memdebug.c \ + $(top_srcdir)/lib/memdebug.h UTIL = \ util.c \ @@ -48,21 +48,21 @@ rtspd_CFLAGS = $(AM_CFLAGS) sockfilt_SOURCES = $(CURLX_SRCS) $(CURLX_HDRS) $(USEFUL) $(UTIL) \ server_sockaddr.h \ sockfilt.c \ - $(top_srcdir)/lib/curl_inet_pton.c + $(top_srcdir)/lib/inet_pton.c sockfilt_LDADD = @CURL_NETWORK_AND_TIME_LIBS@ sockfilt_CFLAGS = $(AM_CFLAGS) sws_SOURCES = $(CURLX_SRCS) $(CURLX_HDRS) $(USEFUL) $(UTIL) \ server_sockaddr.h \ sws.c \ - $(top_srcdir)/lib/curl_inet_pton.c + $(top_srcdir)/lib/inet_pton.c sws_LDADD = @CURL_NETWORK_AND_TIME_LIBS@ sws_CFLAGS = $(AM_CFLAGS) tftpd_SOURCES = $(CURLX_SRCS) $(CURLX_HDRS) $(USEFUL) $(UTIL) \ server_sockaddr.h \ tftpd.c \ - server_tftp.h + tftp.h tftpd_LDADD = @CURL_NETWORK_AND_TIME_LIBS@ tftpd_CFLAGS = $(AM_CFLAGS) diff --git a/tests/server/fake_ntlm.c b/tests/server/fake_ntlm.c index 1c10e4812..64f0675e7 100644 --- a/tests/server/fake_ntlm.c +++ b/tests/server/fake_ntlm.c @@ -34,8 +34,8 @@ #include "getpart.h" #include "util.h" -/* include curl_memdebug.h last */ -#include "curl_memdebug.h" +/* include memdebug.h last */ +#include "memdebug.h" #ifndef DEFAULT_LOGFILE #define DEFAULT_LOGFILE "log/fake_ntlm.log" diff --git a/tests/server/getpart.c b/tests/server/getpart.c index 56719f05b..f37f88cba 100644 --- a/tests/server/getpart.c +++ b/tests/server/getpart.c @@ -36,8 +36,8 @@ struct SessionHandle { #include "curl_base64.h" #include "curl_memory.h" -/* include curl_memdebug.h last */ -#include "curl_memdebug.h" +/* include memdebug.h last */ +#include "memdebug.h" #define EAT_SPACE(p) while(*(p) && ISSPACE(*(p))) (p)++ diff --git a/tests/server/resolve.c b/tests/server/resolve.c index a094b4d70..d0609888a 100644 --- a/tests/server/resolve.c +++ b/tests/server/resolve.c @@ -51,8 +51,8 @@ #include "curlx.h" /* from the private lib dir */ #include "util.h" -/* include curl_memdebug.h last */ -#include "curl_memdebug.h" +/* include memdebug.h last */ +#include "memdebug.h" static bool use_ipv6 = FALSE; static const char *ipv_inuse = "IPv4"; @@ -136,7 +136,7 @@ int main(int argc, char *argv[]) hints.ai_socktype = SOCK_STREAM; hints.ai_flags = AI_CANONNAME; /* Use parenthesis around function to stop it from being replaced by - the macro in curl_memdebug.h */ + the macro in memdebug.h */ rc = (getaddrinfo)(host, "80", &hints, &ai); } diff --git a/tests/server/rtspd.c b/tests/server/rtspd.c index 65f84e6e1..3c55eff35 100644 --- a/tests/server/rtspd.c +++ b/tests/server/rtspd.c @@ -51,8 +51,8 @@ #include "util.h" #include "server_sockaddr.h" -/* include curl_memdebug.h last */ -#include "curl_memdebug.h" +/* include memdebug.h last */ +#include "memdebug.h" #ifdef ENABLE_IPV6 static bool use_ipv6 = FALSE; diff --git a/tests/server/server_setup.h b/tests/server/server_setup.h index d3efc93eb..193ad84d7 100644 --- a/tests/server/server_setup.h +++ b/tests/server/server_setup.h @@ -24,7 +24,6 @@ #define CURL_NO_OLDIES -#include "curl_setup.h" /* portability help from the lib directory */ +#include "setup.h" /* portability help from the lib directory */ #endif /* HEADER_CURL_SERVER_SETUP_H */ - diff --git a/tests/server/server_tftp.h b/tests/server/server_tftp.h deleted file mode 100644 index 0650efe6a..000000000 --- a/tests/server/server_tftp.h +++ /dev/null @@ -1,61 +0,0 @@ -#ifndef HEADER_CURL_SERVER_TFTP_H -#define HEADER_CURL_SERVER_TFTP_H -/*************************************************************************** - * _ _ ____ _ - * Project ___| | | | _ \| | - * / __| | | | |_) | | - * | (__| |_| | _ <| |___ - * \___|\___/|_| \_\_____| - * - * 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 - * are also available at http://curl.haxx.se/docs/copyright.html. - * - * You may opt to use, copy, modify, merge, publish, distribute and/or sell - * copies of the Software, and permit persons to whom the Software is - * furnished to do so, under the terms of the COPYING file. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ***************************************************************************/ -#include "server_setup.h" - -/* This file is a rewrite/clone of the arpa/tftp.h file for systems without - it. */ - -#define SEGSIZE 512 /* data segment size */ - -#if defined(__GNUC__) && ((__GNUC__ >= 3) || \ - ((__GNUC__ == 2) && defined(__GNUC_MINOR__) && (__GNUC_MINOR__ >= 7))) -# define PACKED_STRUCT __attribute__((__packed__)) -#else -# define PACKED_STRUCT /*NOTHING*/ -#endif - -/* Using a packed struct as binary in a program is begging for problems, but - the tftpd server was written like this so we have this struct here to make - things build. */ - -struct tftphdr { - short th_opcode; /* packet type */ - unsigned short th_block; /* all sorts of things */ - char th_data[1]; /* data or error string */ -} PACKED_STRUCT; - -#define th_stuff th_block -#define th_code th_block -#define th_msg th_data - -#define EUNDEF 0 -#define ENOTFOUND 1 -#define EACCESS 2 -#define ENOSPACE 3 -#define EBADOP 4 -#define EBADID 5 -#define EEXISTS 6 -#define ENOUSER 7 - -#endif /* HEADER_CURL_SERVER_TFTP_H */ diff --git a/tests/server/sockfilt.c b/tests/server/sockfilt.c index 394449ca9..93d0b5d14 100644 --- a/tests/server/sockfilt.c +++ b/tests/server/sockfilt.c @@ -98,12 +98,12 @@ versions instead */ #include "curlx.h" /* from the private lib dir */ #include "getpart.h" -#include "curl_inet_pton.h" +#include "inet_pton.h" #include "util.h" #include "server_sockaddr.h" -/* include curl_memdebug.h last */ -#include "curl_memdebug.h" +/* include memdebug.h last */ +#include "memdebug.h" #define DEFAULT_PORT 8999 diff --git a/tests/server/sws.c b/tests/server/sws.c index 3afbe3e83..44d899fd7 100644 --- a/tests/server/sws.c +++ b/tests/server/sws.c @@ -49,12 +49,12 @@ versions instead */ #include "curlx.h" /* from the private lib dir */ #include "getpart.h" -#include "curl_inet_pton.h" +#include "inet_pton.h" #include "util.h" #include "server_sockaddr.h" -/* include curl_memdebug.h last */ -#include "curl_memdebug.h" +/* include memdebug.h last */ +#include "memdebug.h" #ifdef ENABLE_IPV6 static bool use_ipv6 = FALSE; diff --git a/tests/server/testpart.c b/tests/server/testpart.c index 255bbe8d3..912096f0b 100644 --- a/tests/server/testpart.c +++ b/tests/server/testpart.c @@ -26,8 +26,8 @@ #define _MPRINTF_REPLACE /* use our functions only */ #include -/* include curl_memdebug.h last */ -#include "curl_memdebug.h" +/* include memdebug.h last */ +#include "memdebug.h" int main(int argc, char **argv) { diff --git a/tests/server/tftp.h b/tests/server/tftp.h new file mode 100644 index 000000000..0650efe6a --- /dev/null +++ b/tests/server/tftp.h @@ -0,0 +1,61 @@ +#ifndef HEADER_CURL_SERVER_TFTP_H +#define HEADER_CURL_SERVER_TFTP_H +/*************************************************************************** + * _ _ ____ _ + * Project ___| | | | _ \| | + * / __| | | | |_) | | + * | (__| |_| | _ <| |___ + * \___|\___/|_| \_\_____| + * + * 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 + * are also available at http://curl.haxx.se/docs/copyright.html. + * + * You may opt to use, copy, modify, merge, publish, distribute and/or sell + * copies of the Software, and permit persons to whom the Software is + * furnished to do so, under the terms of the COPYING file. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ***************************************************************************/ +#include "server_setup.h" + +/* This file is a rewrite/clone of the arpa/tftp.h file for systems without + it. */ + +#define SEGSIZE 512 /* data segment size */ + +#if defined(__GNUC__) && ((__GNUC__ >= 3) || \ + ((__GNUC__ == 2) && defined(__GNUC_MINOR__) && (__GNUC_MINOR__ >= 7))) +# define PACKED_STRUCT __attribute__((__packed__)) +#else +# define PACKED_STRUCT /*NOTHING*/ +#endif + +/* Using a packed struct as binary in a program is begging for problems, but + the tftpd server was written like this so we have this struct here to make + things build. */ + +struct tftphdr { + short th_opcode; /* packet type */ + unsigned short th_block; /* all sorts of things */ + char th_data[1]; /* data or error string */ +} PACKED_STRUCT; + +#define th_stuff th_block +#define th_code th_block +#define th_msg th_data + +#define EUNDEF 0 +#define ENOTFOUND 1 +#define EACCESS 2 +#define ENOSPACE 3 +#define EBADOP 4 +#define EBADID 5 +#define EEXISTS 6 +#define ENOUSER 7 + +#endif /* HEADER_CURL_SERVER_TFTP_H */ diff --git a/tests/server/tftpd.c b/tests/server/tftpd.c index c1033a5c0..e8c3c2d82 100644 --- a/tests/server/tftpd.c +++ b/tests/server/tftpd.c @@ -67,7 +67,7 @@ #ifdef HAVE_ARPA_TFTP_H #include #else -#include "server_tftp.h" +#include "tftp.h" #endif #ifdef HAVE_NETDB_H #include @@ -91,8 +91,8 @@ #include "util.h" #include "server_sockaddr.h" -/* include curl_memdebug.h last */ -#include "curl_memdebug.h" +/* include memdebug.h last */ +#include "memdebug.h" /***************************************************************************** * STRUCT DECLARATIONS AND DEFINES * diff --git a/tests/server/util.c b/tests/server/util.c index ef3c8f6a3..30766d80f 100644 --- a/tests/server/util.c +++ b/tests/server/util.c @@ -46,7 +46,7 @@ #include "curlx.h" /* from the private lib dir */ #include "getpart.h" #include "util.h" -#include "curl_timeval.h" +#include "timeval.h" #if defined(ENABLE_IPV6) && defined(__MINGW32__) const struct in6_addr in6addr_any = {{ IN6ADDR_ANY_INIT }}; diff --git a/tests/unit/unit1300.c b/tests/unit/unit1300.c index ba27e4ecc..2b8341683 100644 --- a/tests/unit/unit1300.c +++ b/tests/unit/unit1300.c @@ -21,7 +21,7 @@ ***************************************************************************/ #include "curlcheck.h" -#include "curl_llist.h" +#include "llist.h" static struct curl_llist *llist; diff --git a/tests/unit/unit1301.c b/tests/unit/unit1301.c index 5baf4d5c0..47df481a8 100644 --- a/tests/unit/unit1301.c +++ b/tests/unit/unit1301.c @@ -21,7 +21,7 @@ ***************************************************************************/ #include "curlcheck.h" -#include "curl_strequal.h" +#include "strequal.h" static CURLcode unit_setup( void ) {return CURLE_OK;} static void unit_stop( void ) {} diff --git a/tests/unit/unit1302.c b/tests/unit/unit1302.c index e431fffca..fc50c8865 100644 --- a/tests/unit/unit1302.c +++ b/tests/unit/unit1302.c @@ -21,10 +21,10 @@ ***************************************************************************/ #include "curlcheck.h" -#include "curl_urldata.h" -#include "curl_url.h" +#include "urldata.h" +#include "url.h" /* for Curl_safefree */ #include "curl_base64.h" -#include "curl_memdebug.h" /* LAST include file */ +#include "memdebug.h" /* LAST include file */ static struct SessionHandle *data; diff --git a/tests/unit/unit1303.c b/tests/unit/unit1303.c index 7e9dbc158..2e4f23096 100644 --- a/tests/unit/unit1303.c +++ b/tests/unit/unit1303.c @@ -21,9 +21,9 @@ ***************************************************************************/ #include "curlcheck.h" -#include "curl_urldata.h" -#include "curl_connect.h" -#include "curl_memdebug.h" /* LAST include file */ +#include "urldata.h" +#include "connect.h" +#include "memdebug.h" /* LAST include file */ static struct SessionHandle *data; diff --git a/tests/unit/unit1304.c b/tests/unit/unit1304.c index 3ebd89cbd..8ddd8caee 100644 --- a/tests/unit/unit1304.c +++ b/tests/unit/unit1304.c @@ -21,7 +21,7 @@ ***************************************************************************/ #include "curlcheck.h" -#include "curl_netrc.h" +#include "netrc.h" static char login[LOGINSIZE]; static char password[PASSWORDSIZE]; diff --git a/tests/unit/unit1305.c b/tests/unit/unit1305.c index a4b431114..5900c6dd5 100644 --- a/tests/unit/unit1305.c +++ b/tests/unit/unit1305.c @@ -34,11 +34,11 @@ #define ENABLE_CURLX_PRINTF #include "curlx.h" -#include "curl_hash.h" -#include "curl_hostip.h" +#include "hash.h" +#include "hostip.h" #include "curl_memory.h" -#include "curl_memdebug.h" /* LAST include file */ +#include "memdebug.h" /* LAST include file */ static struct SessionHandle *data; static struct curl_hash *hp; diff --git a/tests/unit/unit1309.c b/tests/unit/unit1309.c index 4a741a19d..1304ba18e 100644 --- a/tests/unit/unit1309.c +++ b/tests/unit/unit1309.c @@ -21,7 +21,7 @@ ***************************************************************************/ #include "curlcheck.h" -#include "curl_splay.h" +#include "splay.h" static CURLcode unit_setup(void) -- cgit v1.2.3