mirror of
https://github.com/moparisthebest/curl
synced 2024-08-13 17:03:50 -04:00
CURL_DOES_CONVERSIONS: fixes
Made it compile and work again after the code move.
This commit is contained in:
parent
c828646f60
commit
9039d19f01
@ -24,6 +24,13 @@
|
|||||||
|
|
||||||
#ifdef CURL_DOES_CONVERSIONS
|
#ifdef CURL_DOES_CONVERSIONS
|
||||||
|
|
||||||
|
#include "non-ascii.h"
|
||||||
|
#include "formdata.h"
|
||||||
|
#include "sendf.h"
|
||||||
|
#include "urldata.h"
|
||||||
|
|
||||||
|
#include <curl/curl.h>
|
||||||
|
|
||||||
#ifdef HAVE_ICONV
|
#ifdef HAVE_ICONV
|
||||||
#include <iconv.h>
|
#include <iconv.h>
|
||||||
/* set default codesets for iconv */
|
/* set default codesets for iconv */
|
||||||
@ -37,10 +44,10 @@
|
|||||||
#endif /* HAVE_ICONV */
|
#endif /* HAVE_ICONV */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Curl_convertclone() returns a malloced copy of the source string (if
|
* Curl_convert_clone() returns a malloced copy of the source string (if
|
||||||
* returning CURLE_OK), with the data converted to network format.
|
* returning CURLE_OK), with the data converted to network format.
|
||||||
*/
|
*/
|
||||||
CURLcode Curl_convertclone(struct SessionHandle *data,
|
CURLcode Curl_convert_clone(struct SessionHandle *data,
|
||||||
const char *indata,
|
const char *indata,
|
||||||
size_t insize,
|
size_t insize,
|
||||||
char **outbuf)
|
char **outbuf)
|
||||||
@ -54,7 +61,7 @@ CURLcode Curl_convertclone(struct SessionHandle *data,
|
|||||||
|
|
||||||
memcpy(convbuf, indata, insize);
|
memcpy(convbuf, indata, insize);
|
||||||
result = Curl_convert_to_network(data, convbuf, insize);
|
result = Curl_convert_to_network(data, convbuf, insize);
|
||||||
if(result) {s
|
if(result) {
|
||||||
free(convbuf);
|
free(convbuf);
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
@ -26,7 +26,7 @@
|
|||||||
#include "urldata.h"
|
#include "urldata.h"
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Curl_convertclone() returns a malloced copy of the source string (if
|
* Curl_convert_clone() returns a malloced copy of the source string (if
|
||||||
* returning CURLE_OK), with the data converted to network format.
|
* returning CURLE_OK), with the data converted to network format.
|
||||||
*
|
*
|
||||||
* If no conversion was needed *outbuf may be NULL.
|
* If no conversion was needed *outbuf may be NULL.
|
||||||
|
@ -103,6 +103,7 @@
|
|||||||
#include "multiif.h"
|
#include "multiif.h"
|
||||||
#include "rtsp.h"
|
#include "rtsp.h"
|
||||||
#include "connect.h"
|
#include "connect.h"
|
||||||
|
#include "non-ascii.h"
|
||||||
|
|
||||||
#define _MPRINTF_REPLACE /* use our functions only */
|
#define _MPRINTF_REPLACE /* use our functions only */
|
||||||
#include <curl/mprintf.h>
|
#include <curl/mprintf.h>
|
||||||
|
Loading…
Reference in New Issue
Block a user