* ditch warnings

[m6w6/ext-http] / http_curl_api.c

diff --git a/http_curl_api.c b/http_curl_api.c
index b40b7218fb5cb1bc1f4d9e67833dee24995f3003..6e96940daf7ad77da0c906f18286d4a0ab9a4623 100644 (file)
--- a/http_curl_api.c
+++ b/http_curl_api.c
@@ -20,14 +20,10 @@
 #endif
 
 #ifdef PHP_WIN32
-#      define _WINSOCKAPI_
-#      define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 #      include <winsock2.h>
-#      include <sys/types.h>
 #endif
 
 #include <curl/curl.h>
-#include <curl/easy.h>
 
 #include "php.h"
 #include "php_http.h"
@@ -62,6 +58,15 @@ ZEND_DECLARE_MODULE_GLOBALS(http)
        http_curl_initbuf(); \
        http_curl_setopts(ch, URL, options);
 
+#define http_curl_perform(ch, clean_curl) \
+       { \
+               CURLcode result; \
+               if (CURLE_OK != (result = curl_easy_perform(ch))) { \
+                       http_curl_cleanup(ch, clean_curl); \
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not perform request: %s", curl_easy_strerror(result)); \
+                       return FAILURE; \
+               } \
+       }
 
 #define http_curl_cleanup(ch, clean_curl) \
        http_curl_freestr(); \
@@ -95,9 +100,9 @@ ZEND_DECLARE_MODULE_GLOBALS(http)
        HTTP_G(curlbuf).size = 0;
 
 #define http_curl_copybuf(data, size) \
-       * size = HTTP_G(curlbuf).used; \
-       * data = ecalloc(1, HTTP_G(curlbuf).used + 1); \
-       memcpy(* data, HTTP_G(curlbuf).data, * size);
+       *size = HTTP_G(curlbuf).used; \
+       *data = ecalloc(1, HTTP_G(curlbuf).used + 1); \
+       memcpy(*data, HTTP_G(curlbuf).data, HTTP_G(curlbuf).used);
 
 #define http_curl_sizebuf(for_size) \
        { \
@@ -482,12 +487,7 @@ PHP_HTTP_API STATUS _http_get_ex(CURL *ch, const char *URL, HashTable *options,
 
        http_curl_startup(ch, clean_curl, URL, options);
        curl_easy_setopt(ch, CURLOPT_HTTPGET, 1);
-
-       if (CURLE_OK != curl_easy_perform(ch)) {
-               http_curl_cleanup(ch, clean_curl);
-               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not perform request");
-               return FAILURE;
-       }
+       http_curl_perform(ch, clean_curl);
 
        if (info) {
                http_curl_getinfo(ch, info);
@@ -507,12 +507,7 @@ PHP_HTTP_API STATUS _http_head_ex(CURL *ch, const char *URL, HashTable *options,
 
        http_curl_startup(ch, clean_curl, URL, options);
        curl_easy_setopt(ch, CURLOPT_NOBODY, 1);
-
-       if (CURLE_OK != curl_easy_perform(ch)) {
-               http_curl_cleanup(ch, clean_curl);
-               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not perform request");
-               return FAILURE;
-       }
+       http_curl_perform(ch, clean_curl);
 
        if (info) {
                http_curl_getinfo(ch, info);
@@ -535,12 +530,7 @@ PHP_HTTP_API STATUS _http_post_data_ex(CURL *ch, const char *URL, char *postdata
        curl_easy_setopt(ch, CURLOPT_POST, 1);
        curl_easy_setopt(ch, CURLOPT_POSTFIELDS, postdata);
        curl_easy_setopt(ch, CURLOPT_POSTFIELDSIZE, postdata_len);
-
-       if (CURLE_OK != curl_easy_perform(ch)) {
-               http_curl_cleanup(ch, clean_curl);
-               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not perform request");
-               return FAILURE;
-       }
+       http_curl_perform(ch, clean_curl);
 
        if (info) {
                http_curl_getinfo(ch, info);
@@ -591,12 +581,7 @@ PHP_HTTP_API STATUS _http_post_curldata_ex(CURL *ch, const char *URL,
        http_curl_startup(ch, clean_curl, URL, options);
        curl_easy_setopt(ch, CURLOPT_POST, 1);
        curl_easy_setopt(ch, CURLOPT_HTTPPOST, curldata);
-
-       if (CURLE_OK != curl_easy_perform(ch)) {
-               http_curl_cleanup(ch, clean_curl);
-               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not perform request");
-               return FAILURE;
-       }
+       http_curl_perform(ch, clean_curl);
 
        if (info) {
                http_curl_getinfo(ch, info);