Commit 439f62bf authored by Yang Tse's avatar Yang Tse
Browse files 

convert Curl_ultous() and Curl_ultouc() functions to curlx_ultous() and
curlx_ultouc(), exposing them through curlx.h to allow proper code reuse
later in our test harness.
parent 693abbae

lib/base64.c

+3 −3
Original line number Diff line number Diff line
@@ -71,11 +71,11 @@ static void decodeQuantum(unsigned char *dest, const char *src) 
      x = (x << 6);

  }



  dest[2] = Curl_ultouc(x);

  dest[2] = curlx_ultouc(x);

  x >>= 8;

  dest[1] = Curl_ultouc(x);

  dest[1] = curlx_ultouc(x);

  x >>= 8;

  dest[0] = Curl_ultouc(x);

  dest[0] = curlx_ultouc(x);

}



/*

lib/curlx.h

+7 −0
Original line number Diff line number Diff line
@@ -56,6 +56,13 @@ 
#include "nonblock.h"

/* "nonblock.h" provides curlx_nonblock() */



#include "warnless.h"

/* "warnless.h" provides functions:



  curlx_ultous()

  curlx_ultouc()

*/



/* Now setup curlx_ * names for the functions that are to become curlx_ and

   be removed from a future libcurl official API:

   curlx_getenv

lib/warnless.c

+2 −2
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 


#include "warnless.h"



unsigned short Curl_ultous(unsigned long ulnum)

unsigned short curlx_ultous(unsigned long ulnum)

{

#ifdef __INTEL_COMPILER

#  pragma warning(push)
@@ -39,7 +39,7 @@ unsigned short Curl_ultous(unsigned long ulnum) 
#endif

}



unsigned char Curl_ultouc(unsigned long ulnum)

unsigned char curlx_ultouc(unsigned long ulnum)

{

#ifdef __INTEL_COMPILER

#  pragma warning(push)

lib/warnless.h

+2 −2
Original line number Diff line number Diff line
@@ -23,8 +23,8 @@ 
 * $Id$

 ***************************************************************************/



unsigned short Curl_ultous(unsigned long ulnum);

unsigned short curlx_ultous(unsigned long ulnum);



unsigned char Curl_ultouc(unsigned long ulnum);

unsigned char curlx_ultouc(unsigned long ulnum);



#endif /* HEADER_CURL_WARNLESS_H */

tests/server/Makefile.inc

+37 −76
Original line number Diff line number Diff line 
noinst_PROGRAMS = getpart resolve rtspd sockfilt sws tftpd



getpart_SOURCES = testpart.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 \

CURLX_SRCS = \

 $(top_srcdir)/lib/mprintf.c \

 $(top_srcdir)/lib/warnless.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

getpart_LDADD = @TEST_SERVER_LIBS@

getpart_CFLAGS = $(AM_CFLAGS)



resolve_SOURCES = resolve.c \

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 = $(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)