mirror of
https://github.com/curl/curl.git
synced 2026-07-24 12:17:16 +03:00
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
This commit is contained in:
Yang Tse
parent
e0ba958e28
commit
4a5aa6682d
370 changed files with 1732 additions and 2024 deletions
|
|
@ -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)
|
||||
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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)++
|
||||
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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 */
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -26,8 +26,8 @@
|
|||
#define _MPRINTF_REPLACE /* use our functions only */
|
||||
#include <curl/mprintf.h>
|
||||
|
||||
/* include curl_memdebug.h last */
|
||||
#include "curl_memdebug.h"
|
||||
/* include memdebug.h last */
|
||||
#include "memdebug.h"
|
||||
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -67,7 +67,7 @@
|
|||
#ifdef HAVE_ARPA_TFTP_H
|
||||
#include <arpa/tftp.h>
|
||||
#else
|
||||
#include "server_tftp.h"
|
||||
#include "tftp.h"
|
||||
#endif
|
||||
#ifdef HAVE_NETDB_H
|
||||
#include <netdb.h>
|
||||
|
|
@ -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 *
|
||||
|
|
|
|||
|
|
@ -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 }};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue