diff options
| -rw-r--r-- | lib/curl_gssapi.h | 4 | ||||
| -rw-r--r-- | lib/http.c | 2 | ||||
| -rw-r--r-- | tests/libtest/lib540.c | 3 | ||||
| -rw-r--r-- | tests/libtest/lib560.c | 5 | ||||
| -rw-r--r-- | tests/server/fake_ntlm.c | 12 |
5 files changed, 18 insertions, 8 deletions
diff --git a/lib/curl_gssapi.h b/lib/curl_gssapi.h index c5fbefe7a..249e864fe 100644 --- a/lib/curl_gssapi.h +++ b/lib/curl_gssapi.h @@ -1,3 +1,5 @@ +#ifndef HEADER_CURL_GSSAPI_H +#define HEADER_CURL_GSSAPI_H /*************************************************************************** * _ _ ____ _ * Project ___| | | | _ \| | @@ -49,3 +51,5 @@ OM_uint32 Curl_gss_init_sec_context( OM_uint32 * ret_flags); #endif /* HAVE_GSSAPI */ + +#endif /* HEADER_CURL_GSSAPI_H */ diff --git a/lib/http.c b/lib/http.c index bb4b38793..6646d5ed3 100644 --- a/lib/http.c +++ b/lib/http.c @@ -1631,7 +1631,7 @@ CURLcode Curl_http(struct connectdata *conn, bool *done) curl_off_t included_body = 0; const char *httpstring; Curl_send_buffer *req_buffer; - curl_off_t postsize; /* off_t type to be able to hold a large file size */ + curl_off_t postsize = 0; /* off_t type to be able to hold a large file size */ int seekerr = CURL_SEEKFUNC_OK; /* Always consider the DO phase done after this function call, even if there diff --git a/tests/libtest/lib540.c b/tests/libtest/lib540.c index 6647ab399..8fb409f07 100644 --- a/tests/libtest/lib540.c +++ b/tests/libtest/lib540.c @@ -76,7 +76,6 @@ static int loop(CURLM *cm, const char* url, const char* userpwd, struct curl_slist *headers) { CURLMsg *msg; - CURLMcode code; long L; int M, Q, U = -1; fd_set R, W, E; @@ -87,7 +86,7 @@ static int loop(CURLM *cm, const char* url, const char* userpwd, while (U) { - code = curl_multi_perform(cm, &U); + (void) curl_multi_perform(cm, &U); if (U) { FD_ZERO(&R); diff --git a/tests/libtest/lib560.c b/tests/libtest/lib560.c index 851d5d193..a91d863ab 100644 --- a/tests/libtest/lib560.c +++ b/tests/libtest/lib560.c @@ -37,7 +37,6 @@ int test(char *URL) { CURL *http_handle; CURLM *multi_handle = NULL; - CURLMcode code; int res; int still_running; /* keep number of running handles */ @@ -63,7 +62,7 @@ int test(char *URL) curl_multi_add_handle(multi_handle, http_handle); /* we start some action by calling perform right away */ - code = curl_multi_perform(multi_handle, &still_running); + (void) curl_multi_perform(multi_handle, &still_running); while(still_running) { struct timeval timeout; @@ -98,7 +97,7 @@ int test(char *URL) case 0: default: /* timeout or readable/writable sockets */ - code = curl_multi_perform(multi_handle, &still_running); + (void) curl_multi_perform(multi_handle, &still_running); break; } } diff --git a/tests/server/fake_ntlm.c b/tests/server/fake_ntlm.c index 624ec6b1c..de7110636 100644 --- a/tests/server/fake_ntlm.c +++ b/tests/server/fake_ntlm.c @@ -27,14 +27,22 @@ * responses with a pre-written string saved in test case test2005. */ -#include <stdio.h> -#include <errno.h> +#define CURL_NO_OLDIES + +#include "setup.h" + +#ifdef HAVE_UNISTD_H #include <unistd.h> +#endif +#define ENABLE_CURLX_PRINTF #include "curlx.h" /* from the private lib dir */ #include "getpart.h" #include "util.h" +/* include memdebug.h last */ +#include "memdebug.h" + #ifndef DEFAULT_LOGFILE #define DEFAULT_LOGFILE "log/fake_ntlm.log" #endif |