diff options
Diffstat (limited to 'lib/sendf.c')
| -rw-r--r-- | lib/sendf.c | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/lib/sendf.c b/lib/sendf.c index 5f39d1f2d..2d1a166bd 100644 --- a/lib/sendf.c +++ b/lib/sendf.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2015, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2014, 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,11 +31,14 @@ #include "ssh.h" #include "multiif.h" #include "non-ascii.h" -#include "curl_printf.h" -#include "strerror.h" -/* The last #include files should be: */ +#define _MPRINTF_REPLACE /* use the internal *printf() functions */ +#include <curl/mprintf.h> + #include "curl_memory.h" +#include "strerror.h" + +/* The last #include file should be: */ #include "memdebug.h" #ifdef CURL_DO_LINEEND_CONV @@ -52,7 +55,7 @@ static size_t convert_lineends(struct SessionHandle *data, /* sanity check */ if((startPtr == NULL) || (size < 1)) { - return size; + return(size); } if(data->state.prev_block_had_trailing_cr) { @@ -114,9 +117,9 @@ static size_t convert_lineends(struct SessionHandle *data, /* tidy up by null terminating the now shorter data */ *outPtr = '\0'; - return (outPtr - startPtr); + return(outPtr - startPtr); } - return size; + return(size); } #endif /* CURL_DO_LINEEND_CONV */ @@ -551,7 +554,7 @@ CURLcode Curl_read(struct connectdata *conn, /* connection data */ ssize_t nread = 0; size_t bytesfromsocket = 0; char *buffertofill = NULL; - bool pipelining = Curl_pipeline_wanted(conn->data->multi, CURLPIPE_HTTP1); + bool pipelining = Curl_multi_pipeline_enabled(conn->data->multi); /* Set 'num' to 0 or 1, depending on which socket that has been sent here. If it is the second socket, we set num to 1. Otherwise to 0. This lets |