diff --git a/src/include/switch_curl.h b/src/include/switch_curl.h index b7e578648a..17c4bd6ce1 100644 --- a/src/include/switch_curl.h +++ b/src/include/switch_curl.h @@ -49,7 +49,7 @@ SWITCH_DECLARE(switch_CURLcode) switch_curl_easy_setopt(CURL *handle, switch_CUR SWITCH_DECLARE(const char *) switch_curl_easy_strerror(switch_CURLcode errornum ); SWITCH_DECLARE(void) switch_curl_init(void); SWITCH_DECLARE(void) switch_curl_destroy(void); -SWITCH_DECLARE(CURLFORMcode) switch_curl_formadd(struct curl_httppost **formpost, struct curl_httppost **lastptr, ...); + #endif diff --git a/src/mod/applications/mod_httapi/mod_httapi.c b/src/mod/applications/mod_httapi/mod_httapi.c index 989eb29832..3d45a2f390 100644 --- a/src/mod/applications/mod_httapi/mod_httapi.c +++ b/src/mod/applications/mod_httapi/mod_httapi.c @@ -1134,7 +1134,7 @@ static switch_status_t process_form_post_params(client_t *client, switch_CURL *c if (fname && pname) { *fname++ = '\0'; - switch_curl_formadd(&formpost, + curl_formadd(&formpost, &lastptr, CURLFORM_COPYNAME, pname, CURLFORM_FILENAME, fname, @@ -1143,7 +1143,7 @@ static switch_status_t process_form_post_params(client_t *client, switch_CURL *c } } else { - switch_curl_formadd(&formpost, + curl_formadd(&formpost, &lastptr, CURLFORM_COPYNAME, hp->name, CURLFORM_COPYCONTENTS, hp->value, diff --git a/src/switch_curl.c b/src/switch_curl.c index 0eea13ec86..5f22b94df0 100644 --- a/src/switch_curl.c +++ b/src/switch_curl.c @@ -73,24 +73,3 @@ SWITCH_DECLARE(void) switch_curl_destroy(void) curl_global_cleanup(); } -/* kind of ugly but there is no better portable way to wrap this function =(::: */ -#ifndef WIN32 -#include "../../../../libs/curl/lib/formdata.c" -#endif - -SWITCH_DECLARE(CURLFORMcode) switch_curl_formadd(struct curl_httppost **httppost, - struct curl_httppost **last_post, - ...) -{ - va_list arg; - CURLFORMcode result; - va_start(arg, last_post); -#ifndef WIN32 - result = FormAdd(httppost, last_post, arg); -#else - result = curl_formadd(httppost, last_post, arg); -#endif - va_end(arg); - return result; -} -