* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * 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
#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
/* sanity check */
if((startPtr == NULL) || (size < 1)) {
- return size;
+ return(size);
}
if(data->state.prev_block_had_trailing_cr) {
/* 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 */
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