* fix layout
[m6w6/ext-http] / http_curl_api.c
index 0669db4d22f6d9379f5f18872f9a288aa64b5879..b4a8077b299cb30c361437efd84fdae0dd8ffcc3 100644 (file)
@@ -21,7 +21,6 @@
 
 #ifdef PHP_WIN32
 #      define _WINSOCKAPI_
-#      define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 #      include <winsock2.h>
 #      include <sys/types.h>
 #endif
@@ -72,8 +71,6 @@ ZEND_DECLARE_MODULE_GLOBALS(http)
                } \
        }
 
-
-
 #define http_curl_cleanup(ch, clean_curl) \
        http_curl_freestr(); \
        http_curl_freebuf(); \
@@ -106,9 +103,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) \
        { \
@@ -494,7 +491,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);
        http_curl_perform(ch, clean_curl);
-       
+
        if (info) {
                http_curl_getinfo(ch, info);
        }