From 628135641dc7dd54bb13237be92d8ee9439a5003 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Fri, 29 Nov 2013 23:06:40 +0100 Subject: basic fixes ext/xmlrpc --- ext/xmlrpc/xmlrpc-epi-php.c | 55 +++++++++++++++++++++++---------------------- 1 file changed, 28 insertions(+), 27 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 b73cbcfe24..f6e368b05c 100644 --- a/ext/xmlrpc/xmlrpc-epi-php.c +++ b/ext/xmlrpc/xmlrpc-epi-php.c @@ -485,7 +485,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; + php_uint_t num_index, last_num = 0; char* my_key; zend_hash_internal_pointer_reset(ht); @@ -532,7 +532,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_P(val), Z_STRLEN_P(val)); + xReturn = XMLRPC_CreateValueBase64(key, Z_STRVAL_P(val), Z_STRSIZE_P(val)); } break; case xmlrpc_datetime: @@ -553,11 +553,11 @@ 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_P(val), Z_STRLEN_P(val)); + xReturn = XMLRPC_CreateValueString(key, Z_STRVAL_P(val), Z_STRSIZE_P(val)); break; case xmlrpc_vector: { - unsigned long num_index; + php_uint_t num_index; zval** pIter; char* my_key; HashTable *ht = NULL; @@ -644,8 +644,8 @@ static zval* XMLRPC_to_PHP(XMLRPC_VALUE el) case xmlrpc_string: pStr = XMLRPC_GetValueString(el); if (pStr) { - Z_STRLEN_P(elem) = XMLRPC_GetValueStringLen(el); - Z_STRVAL_P(elem) = estrndup(pStr, Z_STRLEN_P(elem)); + Z_STRSIZE_P(elem) = XMLRPC_GetValueStringLen(el); + Z_STRVAL_P(elem) = estrndup(pStr, Z_STRSIZE_P(elem)); Z_TYPE_P(elem) = IS_STRING; } break; @@ -662,15 +662,15 @@ static zval* XMLRPC_to_PHP(XMLRPC_VALUE el) Z_TYPE_P(elem) = IS_DOUBLE; break; case xmlrpc_datetime: - Z_STRLEN_P(elem) = XMLRPC_GetValueStringLen(el); - Z_STRVAL_P(elem) = estrndup(XMLRPC_GetValueDateTime_ISO8601(el), Z_STRLEN_P(elem)); + Z_STRSIZE_P(elem) = XMLRPC_GetValueStringLen(el); + Z_STRVAL_P(elem) = estrndup(XMLRPC_GetValueDateTime_ISO8601(el), Z_STRSIZE_P(elem)); Z_TYPE_P(elem) = IS_STRING; break; case xmlrpc_base64: pStr = XMLRPC_GetValueBase64(el); if (pStr) { - Z_STRLEN_P(elem) = XMLRPC_GetValueStringLen(el); - Z_STRVAL_P(elem) = estrndup(pStr, Z_STRLEN_P(elem)); + Z_STRSIZE_P(elem) = XMLRPC_GetValueStringLen(el); + Z_STRVAL_P(elem) = estrndup(pStr, Z_STRSIZE_P(elem)); Z_TYPE_P(elem) = IS_STRING; } break; @@ -704,10 +704,10 @@ PHP_FUNCTION(xmlrpc_encode_request) char *outBuf; zval *vals, *out_opts = NULL; char *method = NULL; - int method_len; + zend_str_size_int 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) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "S!z|a", &method, &method_len, &vals, &out_opts) == FAILURE) { return; } @@ -795,7 +795,7 @@ zval* decode_request_worker(char *xml_in, int xml_in_len, char *encoding_in, zva zval_dtor(method_name_out); Z_TYPE_P(method_name_out) = IS_STRING; Z_STRVAL_P(method_name_out) = estrdup(method_name); - Z_STRLEN_P(method_name_out) = strlen(Z_STRVAL_P(method_name_out)); + Z_STRSIZE_P(method_name_out) = strlen(Z_STRVAL_P(method_name_out)); } else if (retval) { zval_ptr_dtor(&retval); retval = NULL; @@ -816,9 +816,9 @@ PHP_FUNCTION(xmlrpc_decode_request) { char *xml, *encoding = NULL; zval **method; - int xml_len, encoding_len = 0; + zend_str_size_int xml_len, encoding_len = 0; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sZ|s", &xml, &xml_len, &method, &encoding, &encoding_len) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "SZ|S", &xml, &xml_len, &method, &encoding, &encoding_len) == FAILURE) { return; } @@ -838,9 +838,9 @@ PHP_FUNCTION(xmlrpc_decode_request) PHP_FUNCTION(xmlrpc_decode) { char *arg1, *arg2 = NULL; - int arg1_len, arg2_len = 0; + zend_str_size_int arg1_len, arg2_len = 0; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|s", &arg1, &arg1_len, &arg2, &arg2_len) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "S|S", &arg1, &arg1_len, &arg2, &arg2_len) == FAILURE) { return; } @@ -934,7 +934,7 @@ static XMLRPC_VALUE php_xmlrpc_callback(XMLRPC_SERVER server, XMLRPC_REQUEST xRe /* check if the called method has been previous registered */ if(zend_hash_find(Z_ARRVAL_P(pData->server->method_map), Z_STRVAL_P(pData->xmlrpc_method), - Z_STRLEN_P(pData->xmlrpc_method) + 1, + Z_STRSIZE_P(pData->xmlrpc_method) + 1, (void**)&php_function) == SUCCESS) { pData->php_function = *php_function; @@ -1026,12 +1026,12 @@ static void php_xmlrpc_introspection_callback(XMLRPC_SERVER server, void* data) PHP_FUNCTION(xmlrpc_server_register_method) { char *method_key; - int method_key_len; + zend_str_size_int method_key_len; zval *handle, *method_name_save, **method_name; int type; xmlrpc_server_data* server; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rsZ", &handle, &method_key, &method_key_len, &method_name) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rSZ", &handle, &method_key, &method_key_len, &method_name) == FAILURE) { return; } @@ -1096,11 +1096,12 @@ PHP_FUNCTION(xmlrpc_server_call_method) xmlrpc_server_data* server; zval **caller_params, *handle, *output_opts = NULL; char *rawxml; - int rawxml_len, type; + zend_str_size_int rawxml_len; + int type; php_output_options out; int argc =ZEND_NUM_ARGS(); - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rsZ|a", &handle, &rawxml, &rawxml_len, &caller_params, &output_opts) != SUCCESS) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rSZ|a", &handle, &rawxml, &rawxml_len, &caller_params, &output_opts) != SUCCESS) { return; } /* user output options */ @@ -1227,9 +1228,9 @@ PHP_FUNCTION(xmlrpc_parse_method_descriptions) { zval *retval; char *arg1; - int arg1_len; + zend_str_size_int arg1_len; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &arg1, &arg1_len) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "S", &arg1, &arg1_len) == FAILURE) { return; } @@ -1361,7 +1362,7 @@ int set_zval_xmlrpc_type(zval* value, XMLRPC_VALUE_TYPE newtype) /* {{{ */ Z_TYPE_P(type) = IS_STRING; Z_STRVAL_P(type) = estrdup(typestr); - Z_STRLEN_P(type) = strlen(typestr); + Z_STRSIZE_P(type) = strlen(typestr); if (newtype == xmlrpc_datetime) { XMLRPC_VALUE v = XMLRPC_CreateValueDateTime_ISO8601(NULL, value->value.str.val); @@ -1472,10 +1473,10 @@ PHP_FUNCTION(xmlrpc_set_type) { zval **arg; char *type; - int type_len; + zend_str_size_int type_len; XMLRPC_VALUE_TYPE vtype; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Zs", &arg, &type, &type_len) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ZS", &arg, &type, &type_len) == FAILURE) { return; } -- cgit v1.2.1 From adb1e38468dcd50219c594ff2f71bb4d27ee01a4 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Thu, 5 Dec 2013 14:35:06 +0100 Subject: integrated %pd into more ported extensions --- 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 f6e368b05c..49c6fc4d9e 100644 --- a/ext/xmlrpc/xmlrpc-epi-php.c +++ b/ext/xmlrpc/xmlrpc-epi-php.c @@ -594,7 +594,7 @@ static XMLRPC_VALUE PHP_to_XMLRPC_worker (const char* key, zval* in_val, int dep char *num_str = NULL; if (vtype != xmlrpc_vector_array) { - spprintf(&num_str, 0, "%ld", num_index); + spprintf(&num_str, 0, "%pu", num_index); } XMLRPC_AddValueToVector(xReturn, PHP_to_XMLRPC_worker(num_str, *pIter, depth++ TSRMLS_CC)); if (num_str) { -- cgit v1.2.1 From b1abe4ca21e10b04a8bae2d00e8113f4b2b02567 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Wed, 18 Dec 2013 14:46:44 -0800 Subject: mass replacement for zend_size_t/php_size_t --- ext/xmlrpc/xmlrpc-epi-php.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 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 49c6fc4d9e..f4ec50c2f9 100644 --- a/ext/xmlrpc/xmlrpc-epi-php.c +++ b/ext/xmlrpc/xmlrpc-epi-php.c @@ -704,7 +704,7 @@ PHP_FUNCTION(xmlrpc_encode_request) char *outBuf; zval *vals, *out_opts = NULL; char *method = NULL; - zend_str_size_int method_len; + php_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) { @@ -816,7 +816,7 @@ PHP_FUNCTION(xmlrpc_decode_request) { char *xml, *encoding = NULL; zval **method; - zend_str_size_int xml_len, encoding_len = 0; + php_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; @@ -838,7 +838,7 @@ PHP_FUNCTION(xmlrpc_decode_request) PHP_FUNCTION(xmlrpc_decode) { char *arg1, *arg2 = NULL; - zend_str_size_int arg1_len, arg2_len = 0; + php_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; @@ -1026,7 +1026,7 @@ static void php_xmlrpc_introspection_callback(XMLRPC_SERVER server, void* data) PHP_FUNCTION(xmlrpc_server_register_method) { char *method_key; - zend_str_size_int method_key_len; + php_size_t method_key_len; zval *handle, *method_name_save, **method_name; int type; xmlrpc_server_data* server; @@ -1096,7 +1096,7 @@ PHP_FUNCTION(xmlrpc_server_call_method) xmlrpc_server_data* server; zval **caller_params, *handle, *output_opts = NULL; char *rawxml; - zend_str_size_int rawxml_len; + php_size_t rawxml_len; int type; php_output_options out; int argc =ZEND_NUM_ARGS(); @@ -1228,7 +1228,7 @@ PHP_FUNCTION(xmlrpc_parse_method_descriptions) { zval *retval; char *arg1; - zend_str_size_int arg1_len; + php_size_t arg1_len; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "S", &arg1, &arg1_len) == FAILURE) { return; @@ -1473,7 +1473,7 @@ PHP_FUNCTION(xmlrpc_set_type) { zval **arg; char *type; - zend_str_size_int type_len; + php_size_t type_len; XMLRPC_VALUE_TYPE vtype; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ZS", &arg, &type, &type_len) == FAILURE) { -- cgit v1.2.1 From f58d0b35edf25a8f39fad6bd5e0e4eeb5cdfe9a7 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Thu, 19 Dec 2013 05:07:37 -0800 Subject: massive update semantical LONG vs INT replacements --- ext/xmlrpc/xmlrpc-epi-php.c | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 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 f4ec50c2f9..b673ce4660 100644 --- a/ext/xmlrpc/xmlrpc-epi-php.c +++ b/ext/xmlrpc/xmlrpc-epi-php.c @@ -317,7 +317,7 @@ PHP_MINFO_FUNCTION(xmlrpc) */ #if 0 static int add_long(zval* list, char* id, int num) { - if(id) return add_assoc_long(list, id, num); + if(id) return add_assoc_int(list, id, num); else return add_next_index_long(list, num); } @@ -343,7 +343,7 @@ static int 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_LONG) { + if (!(id_len > 1 && id[0] == '0') && is_numeric_string((char *)id, id_len, NULL, NULL, 0) == IS_INT) { long index = strtol(id, NULL, 0); return zend_hash_index_update(Z_ARRVAL_P(list), index, (void *) val, sizeof(zval **), NULL); } else { @@ -492,7 +492,7 @@ static XMLRPC_VECTOR_TYPE determine_vector_type (HashTable *ht) while (1) { int res = my_zend_hash_get_current_key(ht, &my_key, &num_index); - if (res == HASH_KEY_IS_LONG) { + if (res == HASH_KEY_IS_INT) { if (bStruct) { bMixed = 1; break; @@ -541,11 +541,11 @@ static XMLRPC_VALUE PHP_to_XMLRPC_worker (const char* key, zval* in_val, int dep break; case xmlrpc_boolean: convert_to_boolean(val); - xReturn = XMLRPC_CreateValueBoolean(key, Z_LVAL_P(val)); + xReturn = XMLRPC_CreateValueBoolean(key, Z_IVAL_P(val)); break; case xmlrpc_int: - convert_to_long(val); - xReturn = XMLRPC_CreateValueInt(key, Z_LVAL_P(val)); + convert_to_int(val); + xReturn = XMLRPC_CreateValueInt(key, Z_IVAL_P(val)); break; case xmlrpc_double: convert_to_double(val); @@ -585,12 +585,12 @@ static XMLRPC_VALUE PHP_to_XMLRPC_worker (const char* key, zval* in_val, int dep case HASH_KEY_NON_EXISTENT: break; case HASH_KEY_IS_STRING: - case HASH_KEY_IS_LONG: + case HASH_KEY_IS_INT: ht = HASH_OF(*pIter); if (ht) { ht->nApplyCount++; } - if (res == HASH_KEY_IS_LONG) { + if (res == HASH_KEY_IS_INT) { char *num_str = NULL; if (vtype != xmlrpc_vector_array) { @@ -650,11 +650,11 @@ static zval* XMLRPC_to_PHP(XMLRPC_VALUE el) } break; case xmlrpc_int: - Z_LVAL_P(elem) = XMLRPC_GetValueInt(el); - Z_TYPE_P(elem) = IS_LONG; + Z_IVAL_P(elem) = XMLRPC_GetValueInt(el); + Z_TYPE_P(elem) = IS_INT; break; case xmlrpc_boolean: - Z_LVAL_P(elem) = XMLRPC_GetValueBoolean(el); + Z_IVAL_P(elem) = XMLRPC_GetValueBoolean(el); Z_TYPE_P(elem) = IS_BOOL; break; case xmlrpc_double: @@ -900,16 +900,16 @@ PHP_FUNCTION(xmlrpc_server_destroy) return; } - server = zend_list_find(Z_LVAL_P(arg1), &type); + server = zend_list_find(Z_IVAL_P(arg1), &type); if (server && type == le_xmlrpc_server) { - bSuccess = zend_list_delete(Z_LVAL_P(arg1)); + bSuccess = zend_list_delete(Z_IVAL_P(arg1)); /* called by hashtable destructor * destroy_server_data(server); */ } - RETVAL_LONG(bSuccess == SUCCESS); + RETVAL_INT(bSuccess == SUCCESS); } /* }}} */ @@ -1035,7 +1035,7 @@ PHP_FUNCTION(xmlrpc_server_register_method) return; } - server = zend_list_find(Z_LVAL_P(handle), &type); + server = zend_list_find(Z_IVAL_P(handle), &type); if (type == le_xmlrpc_server) { /* register with C engine. every method just calls our standard callback, @@ -1068,7 +1068,7 @@ PHP_FUNCTION(xmlrpc_server_register_introspection_callback) return; } - server = zend_list_find(Z_LVAL_P(handle), &type); + server = zend_list_find(Z_IVAL_P(handle), &type); if (type == le_xmlrpc_server) { /* save for later use */ @@ -1111,7 +1111,7 @@ PHP_FUNCTION(xmlrpc_server_call_method) set_output_options(&out, output_opts); } - server = zend_list_find(Z_LVAL_P(handle), &type); + server = zend_list_find(Z_IVAL_P(handle), &type); if (type == le_xmlrpc_server) { /* HACK: use output encoding for now */ @@ -1208,17 +1208,17 @@ PHP_FUNCTION(xmlrpc_server_add_introspection_data) return; } - server = zend_list_find(Z_LVAL_P(handle), &type); + server = zend_list_find(Z_IVAL_P(handle), &type); if (type == le_xmlrpc_server) { XMLRPC_VALUE xDesc = PHP_to_XMLRPC(desc TSRMLS_CC); if (xDesc) { int retval = XMLRPC_ServerAddIntrospectionData(server->server_ptr, xDesc); XMLRPC_CleanupValue(xDesc); - RETURN_LONG(retval); + RETURN_INT(retval); } } - RETURN_LONG(0); + RETURN_INT(0); } /* }}} */ @@ -1373,7 +1373,7 @@ int set_zval_xmlrpc_type(zval* value, XMLRPC_VALUE_TYPE newtype) /* {{{ */ MAKE_STD_ZVAL(ztimestamp); - ztimestamp->type = IS_LONG; + ztimestamp->type = IS_INT; ztimestamp->value.lval = timestamp; convert_to_object(value); @@ -1418,7 +1418,7 @@ XMLRPC_VALUE_TYPE get_zval_xmlrpc_type(zval* value, zval** newvalue) /* {{{ */ #else case IS_BOOL: #endif - case IS_LONG: + case IS_INT: case IS_RESOURCE: type = xmlrpc_int; break; -- cgit v1.2.1 From 6125278290aa3ab2ac0a1ad22116b9d363b3e915 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Thu, 19 Dec 2013 08:40:41 -0800 Subject: more semantical replacements LONG vs. INT --- 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 b673ce4660..4aae602f06 100644 --- a/ext/xmlrpc/xmlrpc-epi-php.c +++ b/ext/xmlrpc/xmlrpc-epi-php.c @@ -318,7 +318,7 @@ 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_long(list, num); + else return add_next_index_int(list, num); } static int add_double(zval* list, char* id, double num) { -- cgit v1.2.1 From 63d3f0b844b3a5f1c94be3c97bca29235dc2b3fc Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Tue, 19 Aug 2014 08:07:31 +0200 Subject: basic macro replacements, all at once --- 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 e4be0f032c..1c560f38d3 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_long(list, id, num); - else return add_next_index_long(list, num); + if(id) return add_assoc_int(list, id, num); + else return add_next_index_int(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_LONG) { + if (!(id_len > 1 && id[0] == '0') && is_numeric_string((char *)id, id_len, NULL, NULL, 0) == IS_INT) { long index = strtol(id, NULL, 0); zend_hash_index_update(Z_ARRVAL_P(list), index, val); } else { @@ -514,7 +514,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_STRLEN(val)); + xReturn = XMLRPC_CreateValueBase64(key, Z_STRVAL(val), Z_STRSIZE(val)); } break; case xmlrpc_datetime: @@ -526,8 +526,8 @@ 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_long(&val); - xReturn = XMLRPC_CreateValueInt(key, Z_LVAL(val)); + convert_to_int(&val); + xReturn = XMLRPC_CreateValueInt(key, Z_IVAL(val)); break; case xmlrpc_double: convert_to_double(&val); @@ -535,7 +535,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_STRLEN(val)); + xReturn = XMLRPC_CreateValueString(key, Z_STRVAL(val), Z_STRSIZE(val)); break; case xmlrpc_vector: { @@ -616,7 +616,7 @@ static void XMLRPC_to_PHP(XMLRPC_VALUE el, zval *elem) } break; case xmlrpc_int: - ZVAL_LONG(elem, XMLRPC_GetValueInt(el)); + ZVAL_INT(elem, XMLRPC_GetValueInt(el)); break; case xmlrpc_boolean: ZVAL_BOOL(elem, XMLRPC_GetValueBoolean(el)); @@ -1127,9 +1127,9 @@ PHP_FUNCTION(xmlrpc_server_add_introspection_data) if (xDesc) { int retval = XMLRPC_ServerAddIntrospectionData(server->server_ptr, xDesc); XMLRPC_CleanupValue(xDesc); - RETURN_LONG(retval); + RETURN_INT(retval); } - RETURN_LONG(0); + RETURN_INT(0); } /* }}} */ @@ -1273,7 +1273,7 @@ int set_zval_xmlrpc_type(zval* value, XMLRPC_VALUE_TYPE newtype) /* {{{ */ if (timestamp != -1) { zval ztimestamp; - ZVAL_LONG(&ztimestamp, timestamp); + ZVAL_INT(&ztimestamp, timestamp); convert_to_object(value); if (zend_hash_str_update(Z_OBJPROP_P(value), OBJECT_TYPE_ATTR, sizeof(OBJECT_TYPE_ATTR) - 1, &type)) { @@ -1318,7 +1318,7 @@ XMLRPC_VALUE_TYPE get_zval_xmlrpc_type(zval* value, zval* newvalue) /* {{{ */ #else case IS_BOOL: #endif - case IS_LONG: + case IS_INT: case IS_RESOURCE: type = xmlrpc_int; break; -- cgit v1.2.1 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