diff options
| -rw-r--r-- | lib/hostip.h | 14 | ||||
| -rw-r--r-- | lib/url.c | 4 | ||||
| -rw-r--r-- | tests/libtest/first.c | 3 | ||||
| -rw-r--r-- | tests/libtest/test.h | 9 | ||||
| -rw-r--r-- | tests/server/sws.c | 8 | ||||
| -rw-r--r-- | tests/server/util.c | 3 | ||||
| -rw-r--r-- | tests/server/util.h | 3 |
7 files changed, 24 insertions, 20 deletions
diff --git a/lib/hostip.h b/lib/hostip.h index d37203cc5..c6172be0f 100644 --- a/lib/hostip.h +++ b/lib/hostip.h @@ -26,6 +26,10 @@ #include "setup.h" #include "hash.h" +#ifdef HAVE_SETJMP_H +#include <setjmp.h> +#endif + #ifdef NETWARE #undef in_addr_t #define in_addr_t unsigned long @@ -287,7 +291,13 @@ void Curl_destroy_thread_data(struct Curl_async *async); #define CURL_INADDR_NONE INADDR_NONE #endif - - +#ifdef HAVE_SIGSETJMP +/* Forward-declaration of variable defined in hostip.c. Beware this + * is a global and unique instance. This is used to store the return + * address that we can jump back to from inside a signal handler. + * This is not thread-safe stuff. + */ +extern sigjmp_buf curl_jmpenv; +#endif #endif @@ -184,10 +184,6 @@ static void flush_cookies(struct SessionHandle *data, int cleanup); #ifndef WIN32 /* not for WIN32 builds */ -#ifdef HAVE_SIGSETJMP -extern sigjmp_buf curl_jmpenv; -#endif - #ifdef SIGALRM static RETSIGTYPE alarmfunc(int sig) diff --git a/tests/libtest/first.c b/tests/libtest/first.c index a58755c41..d25c7ad28 100644 --- a/tests/libtest/first.c +++ b/tests/libtest/first.c @@ -16,9 +16,6 @@ extern void curl_memdebug(const char *); extern void curl_memlimit(int); #endif -/* test is provided in the test code file */ -int test(char *url); - int select_test (int num_fds, fd_set *rd, fd_set *wr, fd_set *exc, struct timeval *tv) { diff --git a/tests/libtest/test.h b/tests/libtest/test.h index ef85c346f..b4541c6c4 100644 --- a/tests/libtest/test.h +++ b/tests/libtest/test.h @@ -43,8 +43,9 @@ extern char *libtest_arg3; /* set by first.c to the argv[3] or NULL */ extern int test_argc; extern char **test_argv; -int select_test (int num_fds, fd_set *rd, fd_set *wr, fd_set *exc, - struct timeval *tv); +extern int select_test(int num_fds, fd_set *rd, fd_set *wr, fd_set *exc, + struct timeval *tv); + +extern int test(char *URL); /* the actual test function provided by each + individual libXXX.c file */ -int test(char *URL); /* the actual test function provided by each individual - libXXX.c file */ diff --git a/tests/server/sws.c b/tests/server/sws.c index a4d7e89e0..92f485954 100644 --- a/tests/server/sws.c +++ b/tests/server/sws.c @@ -108,8 +108,8 @@ struct httprequest { bool pipelining; /* true if request is pipelined */ }; -int ProcessRequest(struct httprequest *req); -void storerequest(char *reqbuf, ssize_t totalsize); +static int ProcessRequest(struct httprequest *req); +static void storerequest(char *reqbuf, ssize_t totalsize); #define DEFAULT_PORT 8999 @@ -191,7 +191,7 @@ static void sigpipe_handler(int sig) } #endif -int ProcessRequest(struct httprequest *req) +static int ProcessRequest(struct httprequest *req) { char *line=&req->reqbuf[req->checkindex]; bool chunked = FALSE; @@ -482,7 +482,7 @@ int ProcessRequest(struct httprequest *req) } /* store the entire request in a file */ -void storerequest(char *reqbuf, ssize_t totalsize) +static void storerequest(char *reqbuf, ssize_t totalsize) { int res; int error; diff --git a/tests/server/util.c b/tests/server/util.c index 64684545e..af9059721 100644 --- a/tests/server/util.c +++ b/tests/server/util.c @@ -59,9 +59,6 @@ const struct in6_addr in6addr_any = {{ IN6ADDR_ANY_INIT }}; #endif -/* someone else must set this properly */ -extern const char *serverlogfile; - void logmsg(const char *msg, ...) { va_list ap; diff --git a/tests/server/util.h b/tests/server/util.h index 9b9dd598b..aaca005f2 100644 --- a/tests/server/util.h +++ b/tests/server/util.h @@ -32,6 +32,9 @@ void logmsg(const char *msg, ...); /* global variable, where to find the 'data' dir */ extern const char *path; +/* global variable, log file name */ +extern const char *serverlogfile; + #ifdef WIN32 #include <process.h> #include <fcntl.h> |