ported ext/curl

diff --git a/ext/curl/interface.c b/ext/curl/interface.c
index 5985d929937d20e08ef76e92badcba96dadf5185..2f493e268698a67ee731973fde7676c91d082ac8 100644 (file)
--- a/ext/curl/interface.c
+++ b/ext/curl/interface.c
@@ -154,7 +154,7 @@ static void _php_curl_close(zend_resource *rsrc TSRMLS_DC);
 
 #define SAVE_CURL_ERROR(__handle, __err) (__handle)->err.no = (int) __err;
 
-#define CAAL(s, v) add_assoc_int_ex(return_value, s, sizeof(s) - 1, (long) v);
+#define CAAL(s, v) add_assoc_int_ex(return_value, s, sizeof(s) - 1, (php_int_t) v);
 #define CAAD(s, v) add_assoc_double_ex(return_value, s, sizeof(s) - 1, (double) v);
 #define CAAS(s, v) add_assoc_string_ex(return_value, s, sizeof(s) - 1, (char *) (v ? v : ""));
 #define CAASTR(s, v) add_assoc_str_ex(return_value, s, sizeof(s) - 1, v ? v : STR_EMPTY_ALLOC());
@@ -166,7 +166,7 @@ static void _php_curl_close(zend_resource *rsrc TSRMLS_DC);
 # define php_curl_ret(__ret) RETVAL_FALSE; return;
 #endif
 
-static int php_curl_option_str(php_curl *ch, long option, const char *str, const int len, zend_bool make_copy TSRMLS_DC)
+static int php_curl_option_str(php_curl *ch, php_int_t option, const char *str, const int len, zend_bool make_copy TSRMLS_DC)
 {
        CURLcode error = CURLE_OK;
 
@@ -1670,9 +1670,9 @@ static void curl_free_slist(zval *el)
 PHP_FUNCTION(curl_version)
 {
        curl_version_info_data *d;
-       long uversion = CURLVERSION_NOW;
+       php_int_t uversion = CURLVERSION_NOW;
 
-       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &uversion) == FAILURE) {
+       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|i", &uversion) == FAILURE) {
                return;
        }
 
@@ -1986,7 +1986,7 @@ PHP_FUNCTION(curl_copy_handle)
 }
 /* }}} */
 
-static int _php_curl_setopt(php_curl *ch, long option, zval *zvalue TSRMLS_DC) /* {{{ */
+static int _php_curl_setopt(php_curl *ch, php_int_t option, zval *zvalue TSRMLS_DC) /* {{{ */
 {
        CURLcode error = CURLE_OK;
 
@@ -2744,10 +2744,10 @@ static int _php_curl_setopt(php_curl *ch, long option, zval *zvalue TSRMLS_DC) /
 PHP_FUNCTION(curl_setopt)
 {
        zval       *zid, *zvalue;
-       long        options;
+       php_int_t        options;
        php_curl   *ch;
 
-       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rlz", &zid, &options, &zvalue) == FAILURE) {
+       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "riz", &zid, &options, &zvalue) == FAILURE) {
                return;
        }
 
@@ -2772,7 +2772,7 @@ PHP_FUNCTION(curl_setopt_array)
 {
        zval            *zid, *arr, *entry;
        php_curl        *ch;
-       ulong           option;
+       php_uint_t      option;
        zend_string     *string_key;
 
        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "za", &zid, &arr) == FAILURE) {
@@ -2787,7 +2787,7 @@ PHP_FUNCTION(curl_setopt_array)
                                        "Array keys must be CURLOPT constants or equivalent integer values");
                        RETURN_FALSE;
                }
-               if (_php_curl_setopt(ch, (long) option, entry TSRMLS_CC) == FAILURE) {
+               if (_php_curl_setopt(ch, (php_int_t) option, entry TSRMLS_CC) == FAILURE) {
                        RETURN_FALSE;
                }
        } ZEND_HASH_FOREACH_END();
@@ -2872,9 +2872,9 @@ PHP_FUNCTION(curl_getinfo)
 {
        zval            *zid;
        php_curl        *ch;
-       long            option = 0;
+       php_int_t               option = 0;
 
-       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|l", &zid, &option) == FAILURE) {
+       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|i", &zid, &option) == FAILURE) {
                return;
        }
 
@@ -2882,7 +2882,7 @@ PHP_FUNCTION(curl_getinfo)
 
        if (ZEND_NUM_ARGS() < 2) {
                char *s_code;
-               long l_code;
+               php_int_t l_code;
                double d_code;
 #if LIBCURL_VERSION_NUM >  0x071301
                struct curl_certinfo *ci = NULL;
@@ -3026,7 +3026,7 @@ PHP_FUNCTION(curl_getinfo)
                                        }
                                        case CURLINFO_LONG:
                                        {
-                                               long code = 0;
+                                               php_int_t code = 0;
 
                                                if (curl_easy_getinfo(ch->cp, option, &code) == CURLE_OK) {
                                                        RETURN_INT(code);
@@ -3217,10 +3217,10 @@ static void _php_curl_close(zend_resource *rsrc TSRMLS_DC)
       return string describing error code */
 PHP_FUNCTION(curl_strerror)
 {
-       long code;
+       php_int_t code;
        const char *str;
 
-       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &code) == FAILURE) {
+       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "i", &code) == FAILURE) {
                return;
        }
 
@@ -3363,11 +3363,11 @@ PHP_FUNCTION(curl_unescape)
        pause and unpause a connection */
 PHP_FUNCTION(curl_pause)
 {
-       long       bitmask;
+       php_int_t       bitmask;
        zval       *zid;
        php_curl   *ch;
 
-       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl", &zid, &bitmask) == FAILURE) {
+       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ri", &zid, &bitmask) == FAILURE) {
                return;
        }
 

diff --git a/ext/curl/multi.c b/ext/curl/multi.c
index 58c33c141c8a877f5c6ca8c13e833d8103a726be..a3441bda781a59c4d40556a4836082fd073a91c7 100644 (file)
--- a/ext/curl/multi.c
+++ b/ext/curl/multi.c
@@ -92,7 +92,7 @@ PHP_FUNCTION(curl_multi_add_handle)
 
        zend_llist_add_element(&mh->easyh, &tmp_val);
 
-       RETURN_INT((long)curl_multi_add_handle(mh->multi, ch->cp));     
+       RETURN_INT((php_int_t)curl_multi_add_handle(mh->multi, ch->cp));        
 }
 /* }}} */
 
@@ -140,7 +140,7 @@ PHP_FUNCTION(curl_multi_remove_handle)
        ZEND_FETCH_RESOURCE(mh, php_curlm *, z_mh, -1, le_curl_multi_handle_name, le_curl_multi_handle);
        ZEND_FETCH_RESOURCE(ch, php_curl *, z_ch, -1, le_curl_name, le_curl);
 
-       RETVAL_INT((long)curl_multi_remove_handle(mh->multi, ch->cp));
+       RETVAL_INT((php_int_t)curl_multi_remove_handle(mh->multi, ch->cp));
        zend_llist_del_element(&mh->easyh, &z_ch, (int (*)(void *, void *))curl_compare_resources);
 
 }
@@ -357,10 +357,10 @@ void _php_curl_multi_close(zend_resource *rsrc TSRMLS_DC) /* {{{ */
          return string describing error code */
 PHP_FUNCTION(curl_multi_strerror)
 {
-       long code;
+       php_int_t code;
        const char *str;
 
-       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &code) == FAILURE) {
+       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "i", &code) == FAILURE) {
                return;
        }
 
@@ -375,7 +375,7 @@ PHP_FUNCTION(curl_multi_strerror)
 #endif
 
 #if LIBCURL_VERSION_NUM >= 0x070f04 /* 7.15.4 */
-static int _php_curl_multi_setopt(php_curlm *mh, long option, zval *zvalue, zval *return_value TSRMLS_DC) /* {{{ */
+static int _php_curl_multi_setopt(php_curlm *mh, php_int_t option, zval *zvalue, zval *return_value TSRMLS_DC) /* {{{ */
 { 
        CURLMcode error = CURLM_OK;
 
@@ -409,10 +409,10 @@ static int _php_curl_multi_setopt(php_curlm *mh, long option, zval *zvalue, zval
 PHP_FUNCTION(curl_multi_setopt)
 {
        zval       *z_mh, *zvalue;
-       long        options;
+       php_int_t        options;
        php_curlm *mh;
 
-       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rlz", &z_mh, &options, &zvalue) == FAILURE) {
+       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "riz", &z_mh, &options, &zvalue) == FAILURE) {
                return;
        }
 

diff --git a/ext/curl/share.c b/ext/curl/share.c
index ed62b83076d5d693dec49ebcff2814ee11101d72..a0d5b006d0e5a2fba39285889b3cb9c2ce9a2ecc 100644 (file)
--- a/ext/curl/share.c
+++ b/ext/curl/share.c
@@ -66,7 +66,7 @@ PHP_FUNCTION(curl_share_close)
 }
 /* }}} */
 
-static int _php_curl_share_setopt(php_curlsh *sh, long option, zval *zvalue, zval *return_value TSRMLS_DC) /* {{{ */
+static int _php_curl_share_setopt(php_curlsh *sh, php_int_t option, zval *zvalue, zval *return_value TSRMLS_DC) /* {{{ */
 {
        CURLSHcode error = CURLSHE_OK;
 
@@ -96,10 +96,10 @@ static int _php_curl_share_setopt(php_curlsh *sh, long option, zval *zvalue, zva
 PHP_FUNCTION(curl_share_setopt)
 {
        zval       *zid, *zvalue;
-       long        options;
+       php_int_t        options;
        php_curlsh *sh;
 
-       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rlz", &zid, &options, &zvalue) == FAILURE) {
+       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "riz", &zid, &options, &zvalue) == FAILURE) {
                return;
        }