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

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

View file

@ -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 "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"
)

View file

@ -140,7 +140,7 @@ HEAD
if($c) {
print <<HEAD
#include <zlib.h>
#include "memdebug.h" /* keep this as LAST include */
#include "curl_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

View file

@ -33,7 +33,7 @@
#include "tool_binmode.h"
#include "memdebug.h" /* keep this as LAST include */
#include "curl_memdebug.h" /* keep this as LAST include */
void set_binmode(FILE *stream)
{

View file

@ -23,7 +23,7 @@
#include "tool_bname.h"
#include "memdebug.h" /* keep this as LAST include */
#include "curl_memdebug.h" /* keep this as LAST include */
#ifndef HAVE_BASENAME

View file

@ -30,7 +30,7 @@
#include "tool_cb_dbg.h"
#include "tool_util.h"
#include "memdebug.h" /* keep this as LAST include */
#include "curl_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,

View file

@ -21,7 +21,7 @@
***************************************************************************/
#include "tool_setup.h"
#include "rawstr.h"
#include "curl_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 "memdebug.h" /* keep this as LAST include */
#include "curl_memdebug.h" /* keep this as LAST include */
static char *parse_filename(const char *ptr, size_t len);

View file

@ -28,7 +28,7 @@
#include "tool_cfgable.h"
#include "tool_cb_prg.h"
#include "memdebug.h" /* keep this as LAST include */
#include "curl_memdebug.h" /* keep this as LAST include */
/*
** callback for CURLOPT_PROGRESSFUNCTION

View file

@ -28,7 +28,7 @@
#include "tool_cfgable.h"
#include "tool_cb_rea.h"
#include "memdebug.h" /* keep this as LAST include */
#include "curl_memdebug.h" /* keep this as LAST include */
/*
** callback for CURLOPT_READFUNCTION

View file

@ -28,7 +28,7 @@
#include "tool_cfgable.h"
#include "tool_cb_see.h"
#include "memdebug.h" /* keep this as LAST include */
#include "curl_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

View file

@ -29,7 +29,7 @@
#include "tool_msgs.h"
#include "tool_cb_wrt.h"
#include "memdebug.h" /* keep this as LAST include */
#include "curl_memdebug.h" /* keep this as LAST include */
/*
** callback for CURLOPT_WRITEFUNCTION

View file

@ -23,7 +23,7 @@
#include "tool_cfgable.h"
#include "memdebug.h" /* keep this as LAST include */
#include "curl_memdebug.h" /* keep this as LAST include */
void free_config_fields(struct Configurable *config)
{

View file

@ -29,7 +29,7 @@
#include "tool_convert.h"
#include "memdebug.h" /* keep this as LAST include */
#include "curl_memdebug.h" /* keep this as LAST include */
#ifdef HAVE_ICONV

View file

@ -33,7 +33,7 @@
#include "tool_dirhie.h"
#include "memdebug.h" /* keep this as LAST include */
#include "curl_memdebug.h" /* keep this as LAST include */
#ifdef NETWARE
# ifndef __NOVELL_LIBC__

View file

@ -35,7 +35,7 @@
#include "tool_bname.h"
#include "tool_doswin.h"
#include "memdebug.h" /* keep this as LAST include */
#include "curl_memdebug.h" /* keep this as LAST include */
/*
* Macros ALWAYS_TRUE and ALWAYS_FALSE are used to avoid compiler warnings.

View file

@ -31,7 +31,7 @@
#include "tool_easysrc.h"
#include "tool_msgs.h"
#include "memdebug.h" /* keep this as LAST include */
#include "curl_memdebug.h" /* keep this as LAST include */
/* global variable definitions, for easy-interface source code generation */

View file

@ -21,7 +21,7 @@
***************************************************************************/
#include "tool_setup.h"
#include "rawstr.h"
#include "curl_rawstr.h"
#define ENABLE_CURLX_PRINTF
/* use our own printf() functions */
@ -32,7 +32,7 @@
#include "tool_msgs.h"
#include "tool_formparse.h"
#include "memdebug.h" /* keep this as LAST include */
#include "curl_memdebug.h" /* keep this as LAST include */
/***************************************************************************
*

View file

@ -21,7 +21,7 @@
***************************************************************************/
#include "tool_setup.h"
#include "rawstr.h"
#include "curl_rawstr.h"
#define ENABLE_CURLX_PRINTF
/* use our own printf() functions */
@ -45,7 +45,7 @@
#include "tool_parsecfg.h"
#include "tool_version.h"
#include "memdebug.h" /* keep this as LAST include */
#include "curl_memdebug.h" /* keep this as LAST include */
#ifdef MSDOS
# define USE_WATT32

View file

@ -57,7 +57,7 @@
#include "tool_getpass.h"
#include "memdebug.h" /* keep this as LAST include */
#include "curl_memdebug.h" /* keep this as LAST include */
#ifdef __VMS
/* VMS implementation */

View file

@ -24,7 +24,7 @@
#include "tool_panykey.h"
#include "tool_help.h"
#include "memdebug.h" /* keep this as LAST include */
#include "curl_memdebug.h" /* keep this as LAST include */
#ifdef MSDOS
# define USE_WATT32

View file

@ -21,7 +21,7 @@
***************************************************************************/
#include "tool_setup.h"
#include "rawstr.h"
#include "curl_rawstr.h"
#define ENABLE_CURLX_PRINTF
/* use our own printf() functions */
@ -32,7 +32,7 @@
#include "tool_getparam.h"
#include "tool_helpers.h"
#include "memdebug.h" /* keep this as LAST include */
#include "curl_memdebug.h" /* keep this as LAST include */
/*
** Helper functions that are used from more tha one source file.

View file

@ -30,7 +30,7 @@
#include "tool_homedir.h"
#include "memdebug.h" /* keep this as LAST include */
#include "curl_memdebug.h" /* keep this as LAST include */
static char *GetEnv(const char *variable, char do_expand)
{

View file

@ -21,7 +21,7 @@
***************************************************************************/
#include "tool_setup.h"
#include "rawstr.h"
#include "curl_rawstr.h"
#define ENABLE_CURLX_PRINTF
/* use our own printf() functions */
@ -29,7 +29,7 @@
#include "tool_libinfo.h"
#include "memdebug.h" /* keep this as LAST include */
#include "curl_memdebug.h" /* keep this as LAST include */
/* global variable definitions, for libcurl run-time info */

View file

@ -39,7 +39,7 @@
* the library level code from this client-side is ugly, but we do this
* anyway for convenience.
*/
#include "memdebug.h" /* keep this as LAST include */
#include "curl_memdebug.h" /* keep this as LAST include */
#ifdef __VMS
static int vms_show = 0;

View file

@ -89,7 +89,7 @@ struct win32_crypto_hash {
# error "Can't compile METALINK support without a crypto library."
#endif
#include "rawstr.h"
#include "curl_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 "memdebug.h" /* keep this as LAST include */
#include "curl_memdebug.h" /* keep this as LAST include */
/* Copied from tool_getparam.c */
#define GetStr(str,val) do { \

View file

@ -23,7 +23,7 @@
#include "tool_mfiles.h"
#include "memdebug.h" /* keep this as LAST include */
#include "curl_memdebug.h" /* keep this as LAST include */
static void AppendNode(struct multi_files **first,
struct multi_files **last,

View file

@ -28,7 +28,7 @@
#include "tool_cfgable.h"
#include "tool_msgs.h"
#include "memdebug.h" /* keep this as LAST include */
#include "curl_memdebug.h" /* keep this as LAST include */
#define WARN_PREFIX "Warning: "
#define WARN_TEXTWIDTH (79 - (int)strlen(WARN_PREFIX))

View file

@ -39,7 +39,7 @@
# include <netinet/tcp.h>
#endif
#include "rawstr.h"
#include "curl_rawstr.h"
#define ENABLE_CURLX_PRINTF
/* use our own printf() functions */
@ -74,7 +74,7 @@
#include "tool_writeout.h"
#include "tool_xattr.h"
#include "memdebug.h" /* keep this as LAST include */
#include "curl_memdebug.h" /* keep this as LAST include */
#define CURLseparator "--_curl_--"

View file

@ -21,7 +21,7 @@
***************************************************************************/
#include "tool_setup.h"
#include "rawstr.h"
#include "curl_rawstr.h"
#define ENABLE_CURLX_PRINTF
/* use our own printf() functions */
@ -37,7 +37,7 @@
# include "tool_metalink.h"
#endif
#include "memdebug.h" /* keep this as LAST include */
#include "curl_memdebug.h" /* keep this as LAST include */
/*
* my_useragent: returns allocated string with default user agent

View file

@ -33,7 +33,7 @@
#include "tool_panykey.h"
#include "memdebug.h" /* keep this as LAST include */
#include "curl_memdebug.h" /* keep this as LAST include */
void tool_pressanykey(void)
{

View file

@ -21,7 +21,7 @@
***************************************************************************/
#include "tool_setup.h"
#include "rawstr.h"
#include "curl_rawstr.h"
#define ENABLE_CURLX_PRINTF
/* use our own printf() functions */
@ -34,7 +34,7 @@
#include "tool_msgs.h"
#include "tool_paramhlp.h"
#include "memdebug.h" /* keep this as LAST include */
#include "curl_memdebug.h" /* keep this as LAST include */
struct getout *new_getout(struct Configurable *config)
{

View file

@ -32,7 +32,7 @@
#include "tool_msgs.h"
#include "tool_parsecfg.h"
#include "memdebug.h" /* keep this as LAST include */
#include "curl_memdebug.h" /* keep this as LAST include */
#define CURLRC DOT_CHAR "curlrc"
#define ISSEP(x) (((x) == '=') || ((x) == ':'))

View file

@ -31,7 +31,7 @@
#include "tool_easysrc.h"
#include "tool_setopt.h"
#include "memdebug.h" /* keep this as LAST include */
#include "curl_memdebug.h" /* keep this as LAST include */
/* Lookup tables for converting setopt values back to symbols */
/* For enums, values may be in any order. */

View file

@ -25,15 +25,15 @@
#define CURL_NO_OLDIES
/*
* setup.h may define preprocessor macros such as _FILE_OFFSET_BITS and
* curl_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 setup.h before curl.h when building curl.
* therefore we must include curl_setup.h before curl.h when building curl.
*/
#include "setup.h" /* from the lib directory */
#include "curl_setup.h" /* from the lib directory */
/*
* curl tool certainly uses libcurl's external interface.
@ -67,7 +67,7 @@
#endif
#ifndef HAVE_STRDUP
# include "strdup.h"
# include "curl_strdup.h"
# define strdup(ptr) curlx_strdup(ptr)
#endif

View file

@ -37,7 +37,7 @@
#include "tool_sleep.h"
#include "memdebug.h" /* keep this as LAST include */
#include "curl_memdebug.h" /* keep this as LAST include */
void tool_go_sleep(long ms)
{

View file

@ -27,7 +27,7 @@
#include "tool_urlglob.h"
#include "tool_vms.h"
#include "memdebug.h" /* keep this as LAST include */
#include "curl_memdebug.h" /* keep this as LAST include */
typedef enum {
GLOB_OK,

View file

@ -23,7 +23,7 @@
#include "tool_util.h"
#include "memdebug.h" /* keep this as LAST include */
#include "curl_memdebug.h" /* keep this as LAST include */
#if defined(WIN32) && !defined(MSDOS)

View file

@ -34,7 +34,7 @@
#include "curlmsg_vms.h"
#include "tool_vms.h"
#include "memdebug.h" /* keep this as LAST include */
#include "curl_memdebug.h" /* keep this as LAST include */
void decc$__posix_exit(int __status);
void decc$exit(int __status);

View file

@ -32,7 +32,7 @@
#include "tool_writeenv.h"
#include "memdebug.h" /* keep this as LAST include */
#include "curl_memdebug.h" /* keep this as LAST include */
static const struct
{

View file

@ -27,7 +27,7 @@
#include "tool_cfgable.h"
#include "tool_writeout.h"
#include "memdebug.h" /* keep this as LAST include */
#include "curl_memdebug.h" /* keep this as LAST include */
typedef enum {
VAR_NONE, /* must be the first */

View file

@ -27,7 +27,7 @@
#include "tool_xattr.h"
#include "memdebug.h" /* keep this as LAST include */
#include "curl_memdebug.h" /* keep this as LAST include */
#ifdef HAVE_FSETXATTR

View file

@ -311,15 +311,15 @@ SOURCE=".\config-win32.h"
# End Source File
# Begin Source File
SOURCE=..\lib\nonblock.h
SOURCE=..\lib\curl_nonblock.h
# End Source File
# Begin Source File
SOURCE=..\lib\rawstr.h
SOURCE=..\lib\curl_rawstr.h
# End Source File
# Begin Source File
SOURCE=..\lib\strtoofft.h
SOURCE=..\lib\curl_strtoofft.h
# End Source File
# Begin Source File