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

Revert changes relative to lib/*.[ch] recent renaming

Browse source 
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 2013-01-04 02:50:28 +01:00
parent e0ba958e28
commit 4a5aa6682d
370 changed files with 1732 additions and 2024 deletions
Download patch file Download diff file Expand all files Collapse all files

4
tests/convsrctest.pl
View file

@ -6,7 +6,7 @@
# | (__| |_| | _ <| |___
# \___|\___/|_| \_\_____|
#
# Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
# Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, 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)
{

2
tests/libtest/CMakeLists.txt
View file

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

2
tests/libtest/Makefile.inc
View file

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

2
tests/libtest/chkhostname.c
View file

@ -19,7 +19,7 @@
* KIND, either express or implied.
*
***************************************************************************/
#include "curl_setup.h"
#include "setup.h"
#include "curl_gethostname.h"

2
tests/libtest/first.c
View file

@ -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,

4
tests/libtest/lib1500.c
View file

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

4
tests/libtest/lib1501.c
View file

@ -24,8 +24,8 @@
#include <fcntl.h>
#include "testutil.h"
#include "curl_warnless.h"
#include "curl_memdebug.h"
#include "warnless.h"
#include "memdebug.h"
#define TEST_HANG_TIMEOUT 30 * 1000

4
tests/libtest/lib1502.c
View file

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

2
tests/libtest/lib500.c
View file

@ -22,7 +22,7 @@
#include "test.h"
#include "testtrace.h"
#include "curl_memdebug.h"
#include "memdebug.h"
#ifdef LIB585

2
tests/libtest/lib501.c
View file

@ -21,7 +21,7 @@
***************************************************************************/
#include "test.h"
#include "curl_memdebug.h"
#include "memdebug.h"
int test(char *URL)
{

4
tests/libtest/lib502.c
View file

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

4
tests/libtest/lib503.c
View file

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

4
tests/libtest/lib504.c
View file

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

2
tests/libtest/lib505.c
View file

@ -25,7 +25,7 @@
#include <fcntl.h>
#endif
#include "curl_memdebug.h"
#include "memdebug.h"
/*
* This example shows an FTP upload, with a rename of the file just after

2
tests/libtest/lib506.c
View file

@ -23,7 +23,7 @@
#include <curl/mprintf.h>
#include "curl_memdebug.h"
#include "memdebug.h"
static const char *HOSTHEADER = "Host: www.host.foo.com";
static const char *JAR = "log/jar506";

4
tests/libtest/lib507.c
View file

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

2
tests/libtest/lib508.c
View file

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

2
tests/libtest/lib510.c
View file

@ -21,7 +21,7 @@
***************************************************************************/
#include "test.h"
#include "curl_memdebug.h"
#include "memdebug.h"
static const char *post[]={
"one",

2
tests/libtest/lib511.c
View file

@ -21,7 +21,7 @@
***************************************************************************/
#include "test.h"
#include "curl_memdebug.h"
#include "memdebug.h"
int test(char *URL)
{

2
tests/libtest/lib512.c
View file

@ -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 */

2
tests/libtest/lib513.c
View file

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

2
tests/libtest/lib514.c
View file

@ -21,7 +21,7 @@
***************************************************************************/
#include "test.h"
#include "curl_memdebug.h"
#include "memdebug.h"
int test(char *URL)
{

2
tests/libtest/lib515.c
View file

@ -21,7 +21,7 @@
***************************************************************************/
#include "test.h"
#include "curl_memdebug.h"
#include "memdebug.h"
int test(char *URL)
{

2
tests/libtest/lib516.c
View file

@ -21,7 +21,7 @@
***************************************************************************/
#include "test.h"
#include "curl_memdebug.h"
#include "memdebug.h"
int test(char *URL)
{

2
tests/libtest/lib517.c
View file

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

8
tests/libtest/lib518.c
View file

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
* Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
* Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, 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 <limits.h>
#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

2
tests/libtest/lib519.c
View file

@ -21,7 +21,7 @@
***************************************************************************/
#include "test.h"
#include "curl_memdebug.h"
#include "memdebug.h"
int test(char *URL)
{

2
tests/libtest/lib520.c
View file

@ -21,7 +21,7 @@
***************************************************************************/
#include "test.h"
#include "curl_memdebug.h"
#include "memdebug.h"
int test(char *URL)
{

2
tests/libtest/lib521.c
View file

@ -21,7 +21,7 @@
***************************************************************************/
#include "test.h"
#include "curl_memdebug.h"
#include "memdebug.h"
int test(char *URL)
{

2
tests/libtest/lib523.c
View file

@ -21,7 +21,7 @@
***************************************************************************/
#include "test.h"
#include "curl_memdebug.h"
#include "memdebug.h"
int test(char *URL)
{

2
tests/libtest/lib524.c
View file

@ -21,7 +21,7 @@
***************************************************************************/
#include "test.h"
#include "curl_memdebug.h"
#include "memdebug.h"
int test(char *URL)
{

4
tests/libtest/lib525.c
View file

@ -24,8 +24,8 @@
#include <fcntl.h>
#include "testutil.h"
#include "curl_warnless.h"
#include "curl_memdebug.h"
#include "warnless.h"
#include "memdebug.h"
#define TEST_HANG_TIMEOUT 60 * 1000

4
tests/libtest/lib526.c
View file

@ -43,8 +43,8 @@
#include <fcntl.h>
#include "testutil.h"
#include "curl_warnless.h"
#include "curl_memdebug.h"
#include "warnless.h"
#include "memdebug.h"
#define TEST_HANG_TIMEOUT 60 * 1000

4
tests/libtest/lib530.c
View file

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

4
tests/libtest/lib533.c
View file

@ -26,8 +26,8 @@
#include <fcntl.h>
#include "testutil.h"
#include "curl_warnless.h"
#include "curl_memdebug.h"
#include "warnless.h"
#include "memdebug.h"
#define TEST_HANG_TIMEOUT 60 * 1000

4
tests/libtest/lib536.c
View file

@ -24,8 +24,8 @@
#include <fcntl.h>
#include "testutil.h"
#include "curl_warnless.h"
#include "curl_memdebug.h"
#include "warnless.h"
#include "memdebug.h"
#define TEST_HANG_TIMEOUT 60 * 1000

8
tests/libtest/lib537.c
View file

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
* Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
* Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, 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 <limits.h>
#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

2
tests/libtest/lib539.c
View file

@ -21,7 +21,7 @@
***************************************************************************/
#include "test.h"
#include "curl_memdebug.h"
#include "memdebug.h"
int test(char *URL)
{

4
tests/libtest/lib540.c
View file

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

2
tests/libtest/lib541.c
View file

@ -25,7 +25,7 @@
#include <fcntl.h>
#endif
#include "curl_memdebug.h"
#include "memdebug.h"
/*
* Two FTP uploads, the second with no content sent.

2
tests/libtest/lib542.c
View file

@ -25,7 +25,7 @@
#include <fcntl.h>
#endif
#include "curl_memdebug.h"
#include "memdebug.h"
/*
* FTP get with NOBODY but no HEADER

2
tests/libtest/lib543.c
View file

@ -23,7 +23,7 @@
#include "test.h"
#include "curl_memdebug.h"
#include "memdebug.h"
int test(char *URL)
{

2
tests/libtest/lib544.c
View file

@ -21,7 +21,7 @@
***************************************************************************/
#include "test.h"
#include "curl_memdebug.h"
#include "memdebug.h"
static char teststring[] =
#ifdef CURL_DOES_CONVERSIONS

2
tests/libtest/lib547.c
View file

@ -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 */

2
tests/libtest/lib549.c
View file

@ -26,7 +26,7 @@
#include "test.h"
#include "curl_memdebug.h"
#include "memdebug.h"
int test(char *URL)
{

4
tests/libtest/lib552.c
View file

@ -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 */

2
tests/libtest/lib553.c
View file

@ -26,7 +26,7 @@
#include "test.h"
#include "curl_memdebug.h"
#include "memdebug.h"
#define POSTLEN 40960

2
tests/libtest/lib554.c
View file

@ -21,7 +21,7 @@
***************************************************************************/
#include "test.h"
#include "curl_memdebug.h"
#include "memdebug.h"
static char data[]=
#ifdef CURL_DOES_CONVERSIONS

4
tests/libtest/lib555.c
View file

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

2
tests/libtest/lib556.c
View file

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

2
tests/libtest/lib557.c
View file

@ -29,7 +29,7 @@
#include <curl/mprintf.h>
#include "curl_memdebug.h"
#include "memdebug.h"
#if (CURL_SIZEOF_CURL_OFF_T > CURL_SIZEOF_LONG)

4
tests/libtest/lib560.c
View file

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

2
tests/libtest/lib562.c
View file

@ -25,7 +25,7 @@
#include <fcntl.h>
#endif
#include "curl_memdebug.h"
#include "memdebug.h"
/*
* From "KNOWN_BUGS" April 2009:

4
tests/libtest/lib564.c
View file

@ -24,8 +24,8 @@
#include <fcntl.h>
#include "testutil.h"
#include "curl_warnless.h"
#include "curl_memdebug.h"
#include "warnless.h"
#include "memdebug.h"
#define TEST_HANG_TIMEOUT 60 * 1000

2
tests/libtest/lib566.c
View file

@ -21,7 +21,7 @@
***************************************************************************/
#include "test.h"
#include "curl_memdebug.h"
#include "memdebug.h"
int test(char *URL)
{

2
tests/libtest/lib567.c
View file

@ -21,7 +21,7 @@
***************************************************************************/
#include "test.h"
#include "curl_memdebug.h"
#include "memdebug.h"
/*
* Test a simple OPTIONS request with a custom header

2
tests/libtest/lib568.c
View file

@ -30,7 +30,7 @@
#include <curl/mprintf.h>
#include "curl_memdebug.h"
#include "memdebug.h"
/* build request url */
static char *suburl(const char *base, int i)

2
tests/libtest/lib569.c
View file

@ -23,7 +23,7 @@
#include <curl/mprintf.h>
#include "curl_memdebug.h"
#include "memdebug.h"
/* build request url */
static char *suburl(const char *base, int i)

2
tests/libtest/lib570.c
View file

@ -23,7 +23,7 @@
#include <curl/mprintf.h>
#include "curl_memdebug.h"
#include "memdebug.h"
/* build request url */
static char *suburl(const char *base, int i)

4
tests/libtest/lib571.c
View file

@ -39,8 +39,8 @@
#include <curl/mprintf.h>
#include "curl_warnless.h"
#include "curl_memdebug.h"
#include "warnless.h"
#include "memdebug.h"
#define RTP_PKT_CHANNEL(p) ((int)((unsigned char)((p)[1])))

2
tests/libtest/lib572.c
View file

@ -30,7 +30,7 @@
#include <curl/mprintf.h>
#include "curl_memdebug.h"
#include "memdebug.h"
/* build request url */
static char *suburl(const char *base, int i)

4
tests/libtest/lib573.c
View file

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

2
tests/libtest/lib574.c
View file

@ -21,7 +21,7 @@
***************************************************************************/
#include "test.h"
#include "curl_memdebug.h"
#include "memdebug.h"
static int new_fnmatch(const char *pattern, const char *string)
{

4
tests/libtest/lib575.c
View file

@ -24,8 +24,8 @@
#include <fcntl.h>
#include "testutil.h"
#include "curl_warnless.h"
#include "curl_memdebug.h"
#include "warnless.h"
#include "memdebug.h"
#define TEST_HANG_TIMEOUT 60 * 1000

2
tests/libtest/lib576.c
View file

@ -22,7 +22,7 @@
#include "test.h"
#include "testutil.h"
#include "curl_memdebug.h"
#include "memdebug.h"
typedef struct {
int remains;

2
tests/libtest/lib578.c
View file

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

2
tests/libtest/lib579.c
View file

@ -21,7 +21,7 @@
***************************************************************************/
#include "test.h"
#include "curl_memdebug.h"
#include "memdebug.h"
static const char * const post[]={
"one",

4
tests/libtest/lib582.c
View file

@ -24,8 +24,8 @@
#include <fcntl.h>
#include "testutil.h"
#include "curl_warnless.h"
#include "curl_memdebug.h"
#include "warnless.h"
#include "memdebug.h"
#define TEST_HANG_TIMEOUT 60 * 1000

2
tests/libtest/lib583.c
View file

@ -28,7 +28,7 @@
#include <sys/stat.h>
#include "curl_memdebug.h"
#include "memdebug.h"
int test(char *URL)
{

2
tests/libtest/lib586.c
View file

@ -23,7 +23,7 @@
#include <curl/mprintf.h>
#include "curl_memdebug.h"
#include "memdebug.h"
#define THREADS 2

2
tests/libtest/lib590.c
View file

@ -34,7 +34,7 @@
- Start the request
*/
#include "curl_memdebug.h"
#include "memdebug.h"
int test(char *URL)
{

4
tests/libtest/lib591.c
View file

@ -30,8 +30,8 @@
#include <fcntl.h>
#include "testutil.h"
#include "curl_warnless.h"
#include "curl_memdebug.h"
#include "warnless.h"
#include "memdebug.h"
#define TEST_HANG_TIMEOUT 60 * 1000

4
tests/libtest/lib597.c
View file

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

2
tests/libtest/lib598.c
View file

@ -21,7 +21,7 @@
***************************************************************************/
#include "test.h"
#include "curl_memdebug.h"
#include "memdebug.h"
int test(char *URL)
{

2
tests/libtest/lib599.c
View file

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

4
tests/libtest/libauthretry.c
View file

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

4
tests/libtest/libntlmconnect.c
View file

@ -27,8 +27,8 @@
#include <assert.h>
#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

2
tests/libtest/sethostname.c
View file

@ -19,7 +19,7 @@
* KIND, either express or implied.
*
***************************************************************************/
#include "curl_setup.h"
#include "setup.h"
#include "sethostname.h"

12
tests/libtest/test.h
View file

@ -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 <curl/curl.h>
@ -37,7 +37,7 @@
#endif
#ifdef TPF
# include "curl_select.h"
# include "select.h"
#endif
#define test_setopt(A,B,C) \

2
tests/libtest/testtrace.c
View file

@ -27,7 +27,7 @@
#include "testutil.h"
#include "testtrace.h"
#include "curl_memdebug.h"
#include "memdebug.h"
struct libtest_trace_cfg libtest_debug_config;

4
tests/libtest/testutil.c
View file

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

2
tests/libtest/testutil.h
View file

@ -21,7 +21,7 @@
* KIND, either express or implied.
*
***************************************************************************/
#include "curl_setup.h"
#include "setup.h"
struct timeval tutil_tvnow(void);

4
tests/mem-include-scan.pl
View file

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

16
tests/memanalyze.pl
View file

@ -6,7 +6,7 @@
# | (__| |_| | _ <| |___
# \___|\___/|_| \_\_____|
#
# Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
# Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, 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(<FILE>) {
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>) {
}
}
}
# 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(<FILE>) {
}
}
}
# 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;

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

34
tests/server/Makefile.inc
View file

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

4
tests/server/fake_ntlm.c
View file

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

4
tests/server/getpart.c
View file

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

6
tests/server/resolve.c
View file

@ -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);
}

4
tests/server/rtspd.c
View file

@ -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;

3
tests/server/server_setup.h
View file

@ -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 */

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

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 "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;

4
tests/server/testpart.c
View file

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

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

6
tests/server/tftpd.c
View file

@ -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 *

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 "curl_timeval.h"
#include "timeval.h"
#if defined(ENABLE_IPV6) && defined(__MINGW32__)
const struct in6_addr in6addr_any = {{ IN6ADDR_ANY_INIT }};

2
tests/unit/unit1300.c
View file

@ -21,7 +21,7 @@
***************************************************************************/
#include "curlcheck.h"
#include "curl_llist.h"
#include "llist.h"
static struct curl_llist *llist;

2
tests/unit/unit1301.c
View file

@ -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 ) {}

6
tests/unit/unit1302.c
View file

@ -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;

Some files were not shown because too many files have changed in this diff Show more