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/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 +- 14 files changed, 109 insertions(+), 110 deletions(-) delete mode 100644 tests/server/server_tftp.h create mode 100644 tests/server/tftp.h (limited to 'tests/server') 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 }}; -- cgit v1.2.3