From c3e3c98ec666812daaaca896cf5ef758a8a6df14 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Mon, 25 Aug 2014 19:24:55 +0200 Subject: master renames phase 1 --- ext/xmlrpc/xmlrpc-epi-php.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'ext/xmlrpc/xmlrpc-epi-php.c') diff --git a/ext/xmlrpc/xmlrpc-epi-php.c b/ext/xmlrpc/xmlrpc-epi-php.c index fe0c794d1d..42430b13df 100644 --- a/ext/xmlrpc/xmlrpc-epi-php.c +++ b/ext/xmlrpc/xmlrpc-epi-php.c @@ -316,8 +316,8 @@ PHP_MINFO_FUNCTION(xmlrpc) */ #if 0 static int add_long(zval* list, char* id, int num) { - if(id) return add_assoc_int(list, id, num); - else return add_next_index_int(list, num); + if(id) return add_assoc_long(list, id, num); + else return add_next_index_long(list, num); } static int add_double(zval* list, char* id, double num) { @@ -342,7 +342,7 @@ static void add_zval(zval* list, const char* id, zval* val) if (list && val) { if (id) { int id_len = strlen(id); - if (!(id_len > 1 && id[0] == '0') && is_numeric_string((char *)id, id_len, NULL, NULL, 0) == IS_INT) { + if (!(id_len > 1 && id[0] == '0') && is_numeric_string((char *)id, id_len, NULL, NULL, 0) == IS_LONG) { long index = strtol(id, NULL, 0); zend_hash_index_update(Z_ARRVAL_P(list), index, val); } else { @@ -516,7 +516,7 @@ static XMLRPC_VALUE PHP_to_XMLRPC_worker (const char* key, zval* in_val, int dep xReturn = XMLRPC_CreateValueEmpty(); XMLRPC_SetValueID(xReturn, key, 0); } else { - xReturn = XMLRPC_CreateValueBase64(key, Z_STRVAL(val), Z_STRSIZE(val)); + xReturn = XMLRPC_CreateValueBase64(key, Z_STRVAL(val), Z_STRLEN(val)); } break; case xmlrpc_datetime: @@ -529,7 +529,7 @@ static XMLRPC_VALUE PHP_to_XMLRPC_worker (const char* key, zval* in_val, int dep break; case xmlrpc_int: convert_to_int(&val); - xReturn = XMLRPC_CreateValueInt(key, Z_IVAL(val)); + xReturn = XMLRPC_CreateValueInt(key, Z_LVAL(val)); break; case xmlrpc_double: convert_to_double(&val); @@ -537,7 +537,7 @@ static XMLRPC_VALUE PHP_to_XMLRPC_worker (const char* key, zval* in_val, int dep break; case xmlrpc_string: convert_to_string(&val); - xReturn = XMLRPC_CreateValueString(key, Z_STRVAL(val), Z_STRSIZE(val)); + xReturn = XMLRPC_CreateValueString(key, Z_STRVAL(val), Z_STRLEN(val)); break; case xmlrpc_vector: { @@ -618,7 +618,7 @@ static void XMLRPC_to_PHP(XMLRPC_VALUE el, zval *elem) } break; case xmlrpc_int: - ZVAL_INT(elem, XMLRPC_GetValueInt(el)); + ZVAL_LONG(elem, XMLRPC_GetValueInt(el)); break; case xmlrpc_boolean: ZVAL_BOOL(elem, XMLRPC_GetValueBoolean(el)); @@ -945,7 +945,7 @@ static void php_xmlrpc_introspection_callback(XMLRPC_SERVER server, void* data) } else { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid callback '%s' passed", php_function_name->val); } - STR_RELEASE(php_function_name); + zend_string_release(php_function_name); } ZEND_HASH_FOREACH_END(); /* so we don't call the same callbacks ever again */ @@ -1130,9 +1130,9 @@ PHP_FUNCTION(xmlrpc_server_add_introspection_data) if (xDesc) { int retval = XMLRPC_ServerAddIntrospectionData(server->server_ptr, xDesc); XMLRPC_CleanupValue(xDesc); - RETURN_INT(retval); + RETURN_LONG(retval); } - RETURN_INT(0); + RETURN_LONG(0); } /* }}} */ @@ -1276,7 +1276,7 @@ int set_zval_xmlrpc_type(zval* value, XMLRPC_VALUE_TYPE newtype) /* {{{ */ if (timestamp != -1) { zval ztimestamp; - ZVAL_INT(&ztimestamp, timestamp); + ZVAL_LONG(&ztimestamp, timestamp); convert_to_object(value); if (zend_hash_str_update(Z_OBJPROP_P(value), OBJECT_TYPE_ATTR, sizeof(OBJECT_TYPE_ATTR) - 1, &type)) { @@ -1321,7 +1321,7 @@ XMLRPC_VALUE_TYPE get_zval_xmlrpc_type(zval* value, zval* newvalue) /* {{{ */ #else case IS_BOOL: #endif - case IS_INT: + case IS_LONG: case IS_RESOURCE: type = xmlrpc_int; break; -- cgit v1.2.1 From af59e92b24c8f624672720d47ef65bd8457728b9 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Mon, 25 Aug 2014 21:51:49 +0200 Subject: master renames phase 7 --- ext/xmlrpc/xmlrpc-epi-php.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ext/xmlrpc/xmlrpc-epi-php.c') diff --git a/ext/xmlrpc/xmlrpc-epi-php.c b/ext/xmlrpc/xmlrpc-epi-php.c index 42430b13df..ce8ad2889b 100644 --- a/ext/xmlrpc/xmlrpc-epi-php.c +++ b/ext/xmlrpc/xmlrpc-epi-php.c @@ -528,7 +528,7 @@ static XMLRPC_VALUE PHP_to_XMLRPC_worker (const char* key, zval* in_val, int dep xReturn = XMLRPC_CreateValueBoolean(key, Z_TYPE(val) == IS_TRUE); break; case xmlrpc_int: - convert_to_int(&val); + convert_to_long(&val); xReturn = XMLRPC_CreateValueInt(key, Z_LVAL(val)); break; case xmlrpc_double: -- cgit v1.2.1 From 3234480827b27ff5d3469a732167afd289632a96 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Wed, 27 Aug 2014 15:31:48 +0200 Subject: first show to make 's' work with size_t --- ext/xmlrpc/xmlrpc-epi-php.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'ext/xmlrpc/xmlrpc-epi-php.c') diff --git a/ext/xmlrpc/xmlrpc-epi-php.c b/ext/xmlrpc/xmlrpc-epi-php.c index ce8ad2889b..09495b5e4f 100644 --- a/ext/xmlrpc/xmlrpc-epi-php.c +++ b/ext/xmlrpc/xmlrpc-epi-php.c @@ -666,7 +666,7 @@ PHP_FUNCTION(xmlrpc_encode_request) char *outBuf; zval *vals, *out_opts = NULL; char *method = NULL; - int method_len; + size_t method_len; php_output_options out; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s!z|a", &method, &method_len, &vals, &out_opts) == FAILURE) { @@ -775,7 +775,7 @@ PHP_FUNCTION(xmlrpc_decode_request) { char *xml, *encoding = NULL; zval *method; - int xml_len, encoding_len = 0; + size_t xml_len, encoding_len = 0; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sz/|s", &xml, &xml_len, &method, &encoding, &encoding_len) == FAILURE) { return; @@ -792,7 +792,7 @@ PHP_FUNCTION(xmlrpc_decode_request) PHP_FUNCTION(xmlrpc_decode) { char *arg1, *arg2 = NULL; - int arg1_len, arg2_len = 0; + size_t arg1_len, arg2_len = 0; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|s", &arg1, &arg1_len, &arg2, &arg2_len) == FAILURE) { return; @@ -958,7 +958,7 @@ static void php_xmlrpc_introspection_callback(XMLRPC_SERVER server, void* data) PHP_FUNCTION(xmlrpc_server_register_method) { char *method_key; - int method_key_len; + size_t method_key_len; zval *handle, *method_name; xmlrpc_server_data* server; @@ -1020,7 +1020,7 @@ PHP_FUNCTION(xmlrpc_server_call_method) xmlrpc_server_data* server; zval *caller_params, *handle, *output_opts = NULL; char *rawxml; - int rawxml_len; + size_t rawxml_len; php_output_options out; int argc = ZEND_NUM_ARGS(); @@ -1375,7 +1375,7 @@ PHP_FUNCTION(xmlrpc_set_type) { zval *arg; char *type; - int type_len; + size_t type_len; XMLRPC_VALUE_TYPE vtype; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z/s", &arg, &type, &type_len) == FAILURE) { -- cgit v1.2.1 From 6db8d4f829553f61822a794f94c55270e5478a13 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Wed, 27 Aug 2014 19:25:28 +0200 Subject: 's' works with size_t round 3 --- ext/xmlrpc/xmlrpc-epi-php.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ext/xmlrpc/xmlrpc-epi-php.c') diff --git a/ext/xmlrpc/xmlrpc-epi-php.c b/ext/xmlrpc/xmlrpc-epi-php.c index 09495b5e4f..b5b7e87161 100644 --- a/ext/xmlrpc/xmlrpc-epi-php.c +++ b/ext/xmlrpc/xmlrpc-epi-php.c @@ -1141,7 +1141,7 @@ PHP_FUNCTION(xmlrpc_server_add_introspection_data) PHP_FUNCTION(xmlrpc_parse_method_descriptions) { char *arg1; - int arg1_len; + size_t arg1_len; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &arg1, &arg1_len) == FAILURE) { return; -- cgit v1.2.1 From 03bf8c256b443914c741906327b4c56270601312 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Fri, 12 Sep 2014 16:39:09 +0200 Subject: fix type --- ext/xmlrpc/xmlrpc-epi-php.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ext/xmlrpc/xmlrpc-epi-php.c') diff --git a/ext/xmlrpc/xmlrpc-epi-php.c b/ext/xmlrpc/xmlrpc-epi-php.c index b5b7e87161..626737cbba 100644 --- a/ext/xmlrpc/xmlrpc-epi-php.c +++ b/ext/xmlrpc/xmlrpc-epi-php.c @@ -472,7 +472,7 @@ static void set_output_options(php_output_options* options, zval* output_opts) static XMLRPC_VECTOR_TYPE determine_vector_type (HashTable *ht) { int bArray = 0, bStruct = 0, bMixed = 0; - unsigned long num_index, last_num = 0; + zend_ulong num_index, last_num = 0; zend_string* my_key; ZEND_HASH_FOREACH_KEY(ht, num_index, my_key) { @@ -541,7 +541,7 @@ static XMLRPC_VALUE PHP_to_XMLRPC_worker (const char* key, zval* in_val, int dep break; case xmlrpc_vector: { - unsigned long num_index; + zend_ulong num_index; zval* pIter; zend_string* my_key; HashTable *ht = NULL; -- cgit v1.2.1 From d0cb715373c3fbe9dc095378ec5ed8c71f799f67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Schl=C3=BCter?= Date: Fri, 19 Sep 2014 18:33:14 +0200 Subject: s/PHP 5/PHP 7/ --- ext/xmlrpc/xmlrpc-epi-php.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ext/xmlrpc/xmlrpc-epi-php.c') diff --git a/ext/xmlrpc/xmlrpc-epi-php.c b/ext/xmlrpc/xmlrpc-epi-php.c index 626737cbba..d43a31be11 100644 --- a/ext/xmlrpc/xmlrpc-epi-php.c +++ b/ext/xmlrpc/xmlrpc-epi-php.c @@ -35,7 +35,7 @@ /* +----------------------------------------------------------------------+ - | PHP Version 5 | + | PHP Version 7 | +----------------------------------------------------------------------+ | Copyright (c) 1997-2014 The PHP Group | +----------------------------------------------------------------------+ -- cgit v1.2.1