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

convert Curl_ultous() and Curl_ultouc() functions to curlx_ultous() and

Browse source 
curlx_ultouc(), exposing them through curlx.h to allow proper code reuse
later in our test harness.
This commit is contained in:
Yang Tse 2010-02-22 18:56:29 +00:00
parent 693abbae3a
commit 439f62bfa8
9 changed files with 56 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

113
tests/server/Makefile.inc
View file

@ -1,100 +1,61 @@
noinst_PROGRAMS = getpart resolve rtspd sockfilt sws tftpd
getpart_SOURCES = testpart.c \
CURLX_SRCS = \
$(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/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 \
$(top_srcdir)/lib/base64.c \
$(top_srcdir)/lib/base64.h \
$(top_srcdir)/lib/curlx.h \
$(top_srcdir)/lib/memdebug.c \
$(top_srcdir)/lib/memdebug.h \
$(top_srcdir)/lib/mprintf.c \
$(top_srcdir)/lib/warnless.c \
$(top_srcdir)/lib/warnless.h
$(top_srcdir)/lib/memdebug.h
UTIL = \
util.c \
util.h
getpart_SOURCES = $(CURLX_SRCS) $(CURLX_HDRS) $(USEFUL) \
testpart.c
getpart_LDADD = @TEST_SERVER_LIBS@
getpart_CFLAGS = $(AM_CFLAGS)
resolve_SOURCES = resolve.c \
getpart.c \
getpart.h \
$(top_srcdir)/lib/base64.c \
$(top_srcdir)/lib/base64.h \
$(top_srcdir)/lib/curlx.h \
$(top_srcdir)/lib/memdebug.c \
$(top_srcdir)/lib/memdebug.h \
$(top_srcdir)/lib/mprintf.c \
$(top_srcdir)/lib/warnless.c \
$(top_srcdir)/lib/warnless.h
resolve_SOURCES = $(CURLX_SRCS) $(CURLX_HDRS) $(USEFUL) $(UTIL) \
resolve.c
resolve_LDADD = @TEST_SERVER_LIBS@
resolve_CFLAGS = $(AM_CFLAGS)
rtspd_SOURCES = rtspd.c \
getpart.c \
getpart.h \
util.c \
util.h \
$(top_srcdir)/lib/base64.c \
$(top_srcdir)/lib/base64.h \
$(top_srcdir)/lib/curlx.h \
$(top_srcdir)/lib/memdebug.c \
$(top_srcdir)/lib/memdebug.h \
$(top_srcdir)/lib/mprintf.c \
$(top_srcdir)/lib/strequal.c \
$(top_srcdir)/lib/timeval.c \
$(top_srcdir)/lib/warnless.c \
$(top_srcdir)/lib/warnless.h
rtspd_SOURCES = $(CURLX_SRCS) $(CURLX_HDRS) $(USEFUL) $(UTIL) \
rtspd.c
rtspd_LDADD = @TEST_SERVER_LIBS@
rtspd_CFLAGS = $(AM_CFLAGS)
sockfilt_SOURCES = sockfilt.c \
getpart.c \
getpart.h \
util.c \
util.h \
$(top_srcdir)/lib/base64.c \
$(top_srcdir)/lib/base64.h \
$(top_srcdir)/lib/curlx.h \
$(top_srcdir)/lib/inet_pton.c \
$(top_srcdir)/lib/memdebug.c \
$(top_srcdir)/lib/memdebug.h \
$(top_srcdir)/lib/mprintf.c \
$(top_srcdir)/lib/timeval.c \
$(top_srcdir)/lib/warnless.c \
$(top_srcdir)/lib/warnless.h
sockfilt_SOURCES = $(CURLX_SRCS) $(CURLX_HDRS) $(USEFUL) $(UTIL) \
sockfilt.c \
$(top_srcdir)/lib/inet_pton.c
sockfilt_LDADD = @TEST_SERVER_LIBS@
sockfilt_CFLAGS = $(AM_CFLAGS)
sws_SOURCES = sws.c \
getpart.c \
getpart.h \
util.c \
util.h \
$(top_srcdir)/lib/base64.c \
$(top_srcdir)/lib/base64.h \
$(top_srcdir)/lib/curlx.h \
$(top_srcdir)/lib/memdebug.c \
$(top_srcdir)/lib/memdebug.h \
$(top_srcdir)/lib/mprintf.c \
$(top_srcdir)/lib/strequal.c \
$(top_srcdir)/lib/timeval.c \
$(top_srcdir)/lib/warnless.c \
$(top_srcdir)/lib/warnless.h
sws_SOURCES = $(CURLX_SRCS) $(CURLX_HDRS) $(USEFUL) $(UTIL) \
sws.c
sws_LDADD = @TEST_SERVER_LIBS@
sws_CFLAGS = $(AM_CFLAGS)
tftpd_SOURCES = tftpd.c tftp.h \
getpart.c \
getpart.h \
util.c \
util.h \
$(top_srcdir)/lib/base64.c \
$(top_srcdir)/lib/base64.h \
$(top_srcdir)/lib/curlx.h \
$(top_srcdir)/lib/memdebug.c \
$(top_srcdir)/lib/memdebug.h \
$(top_srcdir)/lib/mprintf.c \
$(top_srcdir)/lib/timeval.c \
$(top_srcdir)/lib/warnless.c \
$(top_srcdir)/lib/warnless.h
tftpd_SOURCES = $(CURLX_SRCS) $(CURLX_HDRS) $(USEFUL) $(UTIL) \
tftpd.c \
tftp.h
tftpd_LDADD = @TEST_SERVER_LIBS@
tftpd_CFLAGS = $(AM_CFLAGS)

3
tests/server/rtspd.c
View file

@ -59,7 +59,6 @@
#include "curlx.h" /* from the private lib dir */
#include "getpart.h"
#include "util.h"
#include "warnless.h"
/* include memdebug.h last */
#include "memdebug.h"
@ -1235,7 +1234,7 @@ int main(int argc, char *argv[])
argv[arg]);
return 0;
}
port = Curl_ultous(ulnum);
port = curlx_ultous(ulnum);
arg++;
}
}

5
tests/server/sockfilt.c
View file

@ -110,7 +110,6 @@
#include "getpart.h"
#include "inet_pton.h"
#include "util.h"
#include "warnless.h"
/* include memdebug.h last */
#include "memdebug.h"
@ -899,7 +898,7 @@ int main(int argc, char *argv[])
argv[arg]);
return 0;
}
port = Curl_ultous(ulnum);
port = curlx_ultous(ulnum);
arg++;
}
}
@ -916,7 +915,7 @@ int main(int argc, char *argv[])
argv[arg]);
return 0;
}
connectport = Curl_ultous(ulnum);
connectport = curlx_ultous(ulnum);
arg++;
}
}

3
tests/server/sws.c
View file

@ -60,7 +60,6 @@
#include "curlx.h" /* from the private lib dir */
#include "getpart.h"
#include "util.h"
#include "warnless.h"
/* include memdebug.h last */
#include "memdebug.h"
@ -1139,7 +1138,7 @@ int main(int argc, char *argv[])
argv[arg]);
return 0;
}
port = Curl_ultous(ulnum);
port = curlx_ultous(ulnum);
arg++;
}
}

3
tests/server/tftpd.c
View file

@ -97,7 +97,6 @@
#include "curlx.h" /* from the private lib dir */
#include "getpart.h"
#include "util.h"
#include "warnless.h"
/* include memdebug.h last */
#include "memdebug.h"
@ -717,7 +716,7 @@ int main(int argc, char **argv)
argv[arg]);
return 0;
}
port = Curl_ultous(ulnum);
port = curlx_ultous(ulnum);
arg++;
}
}