romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-24 12:33:37 +03:00
Code Issues Projects Releases Packages Wiki Activity

build: make use of 76 lib/*.h renamed files

Browse source 
76 private header files renamed to use our standard naming scheme.

This change affects 322 files in libcurl's source tree.
This commit is contained in:
Yang Tse 2012-12-28 12:40:20 +01:00
parent ec691ca34b
commit f871de0064
322 changed files with 1346 additions and 1271 deletions
Download patch file Download diff file Expand all files Collapse all files

6
tests/server/CMakeLists.txt
View file

@ -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 "setup_once.h"
${CURL_BINARY_DIR}/lib # To be able to reach "curl_config.h"
${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_BINARY_DIR}/include # To be able to reach "curl/curlbuild.h"
)
if(CURL_USE_ARES)
@ -67,5 +67,5 @@ endforeach()
# SETUP_EXECUTABLE(resolve resolve.c util.c util.h ${useful})
# 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} tftp.h)
# SETUP_EXECUTABLE(tftpd tftpd.c util.c util.h ${useful} server_tftp.h)

14
tests/server/Makefile.inc
View file

@ -10,11 +10,11 @@ CURLX_SRCS = \
CURLX_HDRS = \
$(top_srcdir)/lib/curlx.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
$(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
USEFUL = \
getpart.c \
@ -23,7 +23,7 @@ USEFUL = \
$(top_srcdir)/lib/base64.c \
$(top_srcdir)/lib/curl_base64.h \
$(top_srcdir)/lib/memdebug.c \
$(top_srcdir)/lib/memdebug.h
$(top_srcdir)/lib/curl_memdebug.h
UTIL = \
util.c \
@ -62,7 +62,7 @@ sws_CFLAGS = $(AM_CFLAGS)
tftpd_SOURCES = $(CURLX_SRCS) $(CURLX_HDRS) $(USEFUL) $(UTIL) \
server_sockaddr.h \
tftpd.c \
tftp.h
server_tftp.h
tftpd_LDADD = @CURL_NETWORK_AND_TIME_LIBS@
tftpd_CFLAGS = $(AM_CFLAGS)

4
tests/server/fake_ntlm.c
View file

@ -34,8 +34,8 @@
#include "getpart.h"
#include "util.h"
/* include memdebug.h last */
#include "memdebug.h"
/* include curl_memdebug.h last */
#include "curl_memdebug.h"
#ifndef DEFAULT_LOGFILE
#define DEFAULT_LOGFILE "log/fake_ntlm.log"

4
tests/server/getpart.c
View file

@ -36,8 +36,8 @@ struct SessionHandle {
#include "curl_base64.h"
#include "curl_memory.h"
/* include memdebug.h last */
#include "memdebug.h"
/* include curl_memdebug.h last */
#include "curl_memdebug.h"
#define EAT_SPACE(p) while(*(p) && ISSPACE(*(p))) (p)++

6
tests/server/resolve.c
View file

@ -51,8 +51,8 @@
#include "curlx.h" /* from the private lib dir */
#include "util.h"
/* include memdebug.h last */
#include "memdebug.h"
/* include curl_memdebug.h last */
#include "curl_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 memdebug.h */
the macro in curl_memdebug.h */
rc = (getaddrinfo)(host, "80", &hints, &ai);
}

4
tests/server/rtspd.c
View file

@ -51,8 +51,8 @@
#include "util.h"
#include "server_sockaddr.h"
/* include memdebug.h last */
#include "memdebug.h"
/* include curl_memdebug.h last */
#include "curl_memdebug.h"
#ifdef ENABLE_IPV6
static bool use_ipv6 = FALSE;

3
tests/server/server_setup.h
View file

@ -24,6 +24,7 @@
#define CURL_NO_OLDIES
#include "setup.h" /* portability help from the lib directory */
#include "curl_setup.h" /* portability help from the lib directory */
#endif /* HEADER_CURL_SERVER_SETUP_H */

0
tests/server/tftp.h → tests/server/server_tftp.h
View file

6
tests/server/sockfilt.c
View file

@ -98,12 +98,12 @@
versions instead */
#include "curlx.h" /* from the private lib dir */
#include "getpart.h"
#include "inet_pton.h"
#include "curl_inet_pton.h"
#include "util.h"
#include "server_sockaddr.h"
/* include memdebug.h last */
#include "memdebug.h"
/* include curl_memdebug.h last */
#include "curl_memdebug.h"
#define DEFAULT_PORT 8999

6
tests/server/sws.c
View file

@ -49,12 +49,12 @@
versions instead */
#include "curlx.h" /* from the private lib dir */
#include "getpart.h"
#include "inet_pton.h"
#include "curl_inet_pton.h"
#include "util.h"
#include "server_sockaddr.h"
/* include memdebug.h last */
#include "memdebug.h"
/* include curl_memdebug.h last */
#include "curl_memdebug.h"
#ifdef ENABLE_IPV6
static bool use_ipv6 = FALSE;

4
tests/server/testpart.c
View file

@ -26,8 +26,8 @@
#define _MPRINTF_REPLACE /* use our functions only */
#include <curl/mprintf.h>
/* include memdebug.h last */
#include "memdebug.h"
/* include curl_memdebug.h last */
#include "curl_memdebug.h"
int main(int argc, char **argv)
{

6
tests/server/tftpd.c
View file

@ -67,7 +67,7 @@
#ifdef HAVE_ARPA_TFTP_H
#include <arpa/tftp.h>
#else
#include "tftp.h"
#include "server_tftp.h"
#endif
#ifdef HAVE_NETDB_H
#include <netdb.h>
@ -91,8 +91,8 @@
#include "util.h"
#include "server_sockaddr.h"
/* include memdebug.h last */
#include "memdebug.h"
/* include curl_memdebug.h last */
#include "curl_memdebug.h"
/*****************************************************************************
* STRUCT DECLARATIONS AND DEFINES *

2
tests/server/util.c
View file

@ -46,7 +46,7 @@
#include "curlx.h" /* from the private lib dir */
#include "getpart.h"
#include "util.h"
#include "timeval.h"
#include "curl_timeval.h"
#if defined(ENABLE_IPV6) && defined(__MINGW32__)
const struct in6_addr in6addr_any = {{ IN6ADDR_ANY_INIT }};