From 132bd2130d85e2a9faf87f22bc51543ef2ba7226 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Fri, 29 Nov 2013 16:55:00 +0100 Subject: basic fix for ext/soap --- ext/soap/php_sdl.c | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'ext/soap/php_sdl.c') diff --git a/ext/soap/php_sdl.c b/ext/soap/php_sdl.c index f8c6940c1f..0c93aaddc5 100644 --- a/ext/soap/php_sdl.c +++ b/ext/soap/php_sdl.c @@ -293,10 +293,10 @@ void sdl_set_uri_credentials(sdlCtx *ctx, char *uri TSRMLS_DC) rest += 2; Z_TYPE(new_header) = IS_STRING; - Z_STRLEN(new_header) = Z_STRLEN_PP(header) - (rest - s); - Z_STRVAL(new_header) = emalloc(Z_STRLEN_PP(header) + 1); + Z_STRSIZE(new_header) = Z_STRSIZE_PP(header) - (rest - s); + Z_STRVAL(new_header) = emalloc(Z_STRSIZE_PP(header) + 1); memcpy(Z_STRVAL(new_header), Z_STRVAL_PP(header), s - Z_STRVAL_PP(header)); - memcpy(Z_STRVAL(new_header) + (s - Z_STRVAL_PP(header)), rest, Z_STRLEN_PP(header) - (rest - Z_STRVAL_PP(header)) + 1); + memcpy(Z_STRVAL(new_header) + (s - Z_STRVAL_PP(header)), rest, Z_STRSIZE_PP(header) - (rest - Z_STRVAL_PP(header)) + 1); ctx->old_header = *header; Z_ADDREF_P(ctx->old_header); php_stream_context_set_option(ctx->context, "http", "header", &new_header); @@ -1800,8 +1800,8 @@ static void sdl_serialize_string(const char *str, smart_str *out) static void sdl_serialize_key(HashTable *ht, smart_str *out) { char *key; - uint key_len; - ulong index; + zend_str_size_uint key_len; + php_uint_t index; if (zend_hash_get_current_key_ex(ht, &key, &key_len, &index, 0, NULL) == HASH_KEY_IS_STRING) { WSDL_CACHE_PUT_INT(key_len, out); @@ -2442,9 +2442,9 @@ static HashTable* make_persistent_sdl_function_headers(HashTable *headers, HashT sdlSoapBindingFunctionHeaderPtr *tmp, pheader; encodePtr *penc; sdlTypePtr *ptype; - ulong index; + php_uint_t index; char *key; - uint key_len; + zend_str_size_uint key_len; pheaders = malloc(sizeof(HashTable)); zend_hash_init(pheaders, zend_hash_num_elements(headers), NULL, delete_header_persistent, 1); @@ -2510,9 +2510,9 @@ static HashTable* make_persistent_sdl_parameters(HashTable *params, HashTable *p sdlParamPtr *tmp, pparam; sdlTypePtr *ptype; encodePtr *penc; - ulong index; + php_uint_t index; char *key; - uint key_len; + zend_str_size_uint key_len; pparams = malloc(sizeof(HashTable)); zend_hash_init(pparams, zend_hash_num_elements(params), NULL, delete_parameter_persistent, 1); @@ -2557,9 +2557,9 @@ static HashTable* make_persistent_sdl_function_faults(sdlFunctionPtr func, HashT { HashTable *pfaults; sdlFaultPtr *tmp, pfault; - ulong index; + php_uint_t index; char *key; - uint key_len; + zend_str_size_uint key_len; pfaults = malloc(sizeof(HashTable)); zend_hash_init(pfaults, zend_hash_num_elements(faults), NULL, delete_fault_persistent, 1); @@ -2606,9 +2606,9 @@ static HashTable* make_persistent_sdl_function_faults(sdlFunctionPtr func, HashT static sdlAttributePtr make_persistent_sdl_attribute(sdlAttributePtr attr, HashTable *ptr_map, HashTable *bp_types, HashTable *bp_encoders) { sdlAttributePtr pattr; - ulong index; + php_uint_t index; char *key; - uint key_len; + zend_str_size_uint key_len; pattr = malloc(sizeof(sdlAttribute)); memset(pattr, 0, sizeof(sdlAttribute)); @@ -2718,9 +2718,9 @@ static sdlContentModelPtr make_persistent_sdl_model(sdlContentModelPtr model, Ha static sdlTypePtr make_persistent_sdl_type(sdlTypePtr type, HashTable *ptr_map, HashTable *bp_types, HashTable *bp_encoders) { - ulong index; + php_uint_t index; char *key; - uint key_len; + zend_str_size_uint key_len; sdlTypePtr ptype = NULL; ptype = malloc(sizeof(sdlType)); @@ -2952,9 +2952,9 @@ static sdlPtr make_persistent_sdl(sdlPtr sdl TSRMLS_DC) sdlPtr psdl = NULL; HashTable ptr_map; HashTable bp_types, bp_encoders; - ulong index; + php_uint_t index; char *key; - uint key_len; + zend_str_size_uint key_len; zend_hash_init(&bp_types, 0, NULL, NULL, 0); zend_hash_init(&bp_encoders, 0, NULL, NULL, 0); @@ -3186,7 +3186,7 @@ static void delete_psdl(void *data) free(tmp); } -sdlPtr get_sdl(zval *this_ptr, char *uri, long cache_wsdl TSRMLS_DC) +sdlPtr get_sdl(zval *this_ptr, char *uri, php_int_t cache_wsdl TSRMLS_DC) { char fn[MAXPATHLEN]; sdlPtr sdl = NULL; @@ -3263,7 +3263,7 @@ sdlPtr get_sdl(zval *this_ptr, char *uri, long cache_wsdl TSRMLS_DC) } if (zend_hash_find(Z_OBJPROP_P(this_ptr), "_user_agent", sizeof("_user_agent"), (void **) &tmp) == SUCCESS && - Z_TYPE_PP(tmp) == IS_STRING && Z_STRLEN_PP(tmp) > 0) { + Z_TYPE_PP(tmp) == IS_STRING && Z_STRSIZE_PP(tmp) > 0) { smart_str_appends(&headers, "User-Agent: "); smart_str_appends(&headers, Z_STRVAL_PP(tmp)); smart_str_appends(&headers, "\r\n"); @@ -3377,8 +3377,8 @@ cache_in_memory: HashPosition pos; time_t latest = t; char *key = NULL; - uint key_len; - ulong idx; + zend_str_size_uint key_len; + php_uint_t idx; for (zend_hash_internal_pointer_reset_ex(SOAP_GLOBAL(mem_cache), &pos); zend_hash_get_current_data_ex(SOAP_GLOBAL(mem_cache), (void **) &q, &pos) == SUCCESS; -- cgit v1.2.1 From e094c64b6765e2f70dedb780fe486c67a86bcbe9 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Fri, 29 Nov 2013 20:26:07 +0100 Subject: finer fixes to ext/soap --- ext/soap/php_sdl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ext/soap/php_sdl.c') diff --git a/ext/soap/php_sdl.c b/ext/soap/php_sdl.c index 0c93aaddc5..f9e31abfe4 100644 --- a/ext/soap/php_sdl.c +++ b/ext/soap/php_sdl.c @@ -164,7 +164,7 @@ encodePtr get_encoder(sdlPtr sdl, const char *ns, const char *type) return enc; } -encodePtr get_encoder_ex(sdlPtr sdl, const char *nscat, int len) +encodePtr get_encoder_ex(sdlPtr sdl, const char *nscat, zend_str_size_int len) { encodePtr *enc; TSRMLS_FETCH(); -- cgit v1.2.1 From 05fe153f490364f6f0931757d63e292650133580 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Wed, 11 Dec 2013 19:23:17 +0100 Subject: revamp ext/soap --- ext/soap/php_sdl.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) (limited to 'ext/soap/php_sdl.c') diff --git a/ext/soap/php_sdl.c b/ext/soap/php_sdl.c index f9e31abfe4..dae10d6d46 100644 --- a/ext/soap/php_sdl.c +++ b/ext/soap/php_sdl.c @@ -79,9 +79,9 @@ static sdlTypePtr get_element(sdlPtr sdl, xmlNodePtr node, const xmlChar *type) parse_namespace(type, &cptype, &ns); nsptr = xmlSearchNs(node->doc, node, BAD_CAST(ns)); if (nsptr != NULL) { - int ns_len = xmlStrlen(nsptr->href); - int type_len = strlen(cptype); - int len = ns_len + type_len + 1; + zend_str_size_int ns_len = xmlStrlen(nsptr->href); + zend_str_size_int type_len = strlen(cptype); + zend_str_size_int len = ns_len + type_len + 1; char *nscat = emalloc(len + 1); memcpy(nscat, nsptr->href, ns_len); @@ -111,9 +111,9 @@ encodePtr get_encoder(sdlPtr sdl, const char *ns, const char *type) { encodePtr enc = NULL; char *nscat; - int ns_len = strlen(ns); - int type_len = strlen(type); - int len = ns_len + type_len + 1; + zend_str_size_int ns_len = strlen(ns); + zend_str_size_int type_len = strlen(type); + zend_str_size_int len = ns_len + type_len + 1; nscat = emalloc(len + 1); memcpy(nscat, ns, ns_len); @@ -129,8 +129,8 @@ encodePtr get_encoder(sdlPtr sdl, const char *ns, const char *type) (ns_len == sizeof(SOAP_1_2_ENC_NAMESPACE)-1 && memcmp(ns, SOAP_1_2_ENC_NAMESPACE, sizeof(SOAP_1_2_ENC_NAMESPACE)-1) == 0))) { char *enc_nscat; - int enc_ns_len; - int enc_len; + zend_str_size_int enc_ns_len; + zend_str_size_int enc_len; enc_ns_len = sizeof(XSD_NAMESPACE)-1; enc_len = enc_ns_len + type_len + 1; @@ -229,7 +229,7 @@ static int is_wsdl_element(xmlNodePtr node) void sdl_set_uri_credentials(sdlCtx *ctx, char *uri TSRMLS_DC) { char *s; - int l1, l2; + php_int_t l1, l2; zval *context = NULL; zval **header = NULL; @@ -1028,7 +1028,7 @@ static sdlPtr load_wsdl(zval *this_ptr, char *struri TSRMLS_DC) } else { */ { - int len = strlen(function->functionName); + zend_str_size_int len = strlen(function->functionName); function->responseName = emalloc(len + sizeof("Response")); memcpy(function->responseName, function->functionName, len); memcpy(function->responseName+len, "Response", sizeof("Response")); @@ -1132,7 +1132,7 @@ static sdlPtr load_wsdl(zval *this_ptr, char *struri TSRMLS_DC) { char *tmp = estrdup(function->functionName); - int len = strlen(tmp); + zend_str_size_int len = strlen(tmp); if (zend_hash_add(&ctx.sdl->functions, php_strtolower(tmp, len), len+1, &function, sizeof(sdlFunctionPtr), NULL) != SUCCESS) { zend_hash_next_index_insert(&ctx.sdl->functions, &function, sizeof(sdlFunctionPtr), NULL); @@ -1418,16 +1418,16 @@ static void sdl_deserialize_encoder(encodePtr enc, sdlTypePtr *types, char **in) enc->to_zval = sdl_guess_convert_zval; if (enc->details.sdl_type == NULL) { - int ns_len = strlen(enc->details.ns); - int type_len = strlen(enc->details.type_str); + zend_str_size_int ns_len = strlen(enc->details.ns); + zend_str_size_int type_len = strlen(enc->details.type_str); if (((ns_len == sizeof(SOAP_1_1_ENC_NAMESPACE)-1 && memcmp(enc->details.ns, SOAP_1_1_ENC_NAMESPACE, sizeof(SOAP_1_1_ENC_NAMESPACE)-1) == 0) || (ns_len == sizeof(SOAP_1_2_ENC_NAMESPACE)-1 && memcmp(enc->details.ns, SOAP_1_2_ENC_NAMESPACE, sizeof(SOAP_1_2_ENC_NAMESPACE)-1) == 0))) { char *enc_nscat; - int enc_ns_len; - int enc_len; + zend_str_size_int enc_ns_len; + zend_str_size_int enc_len; encodePtr real_enc; enc_ns_len = sizeof(XSD_NAMESPACE)-1; @@ -1784,7 +1784,7 @@ static sdlPtr get_sdl_from_cache(const char *fn, const char *uri, time_t t, time static void sdl_serialize_string(const char *str, smart_str *out) { - int i; + size_t i; if (str) { i = strlen(str); @@ -3191,7 +3191,7 @@ sdlPtr get_sdl(zval *this_ptr, char *uri, php_int_t cache_wsdl TSRMLS_DC) char fn[MAXPATHLEN]; sdlPtr sdl = NULL; char* old_error_code = SOAP_GLOBAL(error_code); - int uri_len = 0; + zend_str_size_int uri_len = 0; php_stream_context *context=NULL; zval **tmp, **proxy_host, **proxy_port, *orig_context = NULL, *new_context = NULL; smart_str headers = {0}; @@ -3227,10 +3227,10 @@ sdlPtr get_sdl(zval *this_ptr, char *uri, php_int_t cache_wsdl TSRMLS_DC) char md5str[33]; PHP_MD5_CTX context; unsigned char digest[16]; - int len = strlen(SOAP_GLOBAL(cache_dir)); + zend_str_size_int len = strlen(SOAP_GLOBAL(cache_dir)); time_t cached; char *user = php_get_current_user(TSRMLS_C); - int user_len = user ? strlen(user) + 1 : 0; + zend_str_size_int user_len = user ? strlen(user) + 1 : 0; md5str[0] = '\0'; PHP_MD5Init(&context); -- 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/soap/php_sdl.c | 52 ++++++++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 26 deletions(-) (limited to 'ext/soap/php_sdl.c') diff --git a/ext/soap/php_sdl.c b/ext/soap/php_sdl.c index dae10d6d46..7f41712703 100644 --- a/ext/soap/php_sdl.c +++ b/ext/soap/php_sdl.c @@ -79,9 +79,9 @@ static sdlTypePtr get_element(sdlPtr sdl, xmlNodePtr node, const xmlChar *type) parse_namespace(type, &cptype, &ns); nsptr = xmlSearchNs(node->doc, node, BAD_CAST(ns)); if (nsptr != NULL) { - zend_str_size_int ns_len = xmlStrlen(nsptr->href); - zend_str_size_int type_len = strlen(cptype); - zend_str_size_int len = ns_len + type_len + 1; + php_size_t ns_len = xmlStrlen(nsptr->href); + php_size_t type_len = strlen(cptype); + php_size_t len = ns_len + type_len + 1; char *nscat = emalloc(len + 1); memcpy(nscat, nsptr->href, ns_len); @@ -111,9 +111,9 @@ encodePtr get_encoder(sdlPtr sdl, const char *ns, const char *type) { encodePtr enc = NULL; char *nscat; - zend_str_size_int ns_len = strlen(ns); - zend_str_size_int type_len = strlen(type); - zend_str_size_int len = ns_len + type_len + 1; + php_size_t ns_len = strlen(ns); + php_size_t type_len = strlen(type); + php_size_t len = ns_len + type_len + 1; nscat = emalloc(len + 1); memcpy(nscat, ns, ns_len); @@ -129,8 +129,8 @@ encodePtr get_encoder(sdlPtr sdl, const char *ns, const char *type) (ns_len == sizeof(SOAP_1_2_ENC_NAMESPACE)-1 && memcmp(ns, SOAP_1_2_ENC_NAMESPACE, sizeof(SOAP_1_2_ENC_NAMESPACE)-1) == 0))) { char *enc_nscat; - zend_str_size_int enc_ns_len; - zend_str_size_int enc_len; + php_size_t enc_ns_len; + php_size_t enc_len; enc_ns_len = sizeof(XSD_NAMESPACE)-1; enc_len = enc_ns_len + type_len + 1; @@ -164,7 +164,7 @@ encodePtr get_encoder(sdlPtr sdl, const char *ns, const char *type) return enc; } -encodePtr get_encoder_ex(sdlPtr sdl, const char *nscat, zend_str_size_int len) +encodePtr get_encoder_ex(sdlPtr sdl, const char *nscat, php_size_t len) { encodePtr *enc; TSRMLS_FETCH(); @@ -1028,7 +1028,7 @@ static sdlPtr load_wsdl(zval *this_ptr, char *struri TSRMLS_DC) } else { */ { - zend_str_size_int len = strlen(function->functionName); + php_size_t len = strlen(function->functionName); function->responseName = emalloc(len + sizeof("Response")); memcpy(function->responseName, function->functionName, len); memcpy(function->responseName+len, "Response", sizeof("Response")); @@ -1132,7 +1132,7 @@ static sdlPtr load_wsdl(zval *this_ptr, char *struri TSRMLS_DC) { char *tmp = estrdup(function->functionName); - zend_str_size_int len = strlen(tmp); + php_size_t len = strlen(tmp); if (zend_hash_add(&ctx.sdl->functions, php_strtolower(tmp, len), len+1, &function, sizeof(sdlFunctionPtr), NULL) != SUCCESS) { zend_hash_next_index_insert(&ctx.sdl->functions, &function, sizeof(sdlFunctionPtr), NULL); @@ -1418,16 +1418,16 @@ static void sdl_deserialize_encoder(encodePtr enc, sdlTypePtr *types, char **in) enc->to_zval = sdl_guess_convert_zval; if (enc->details.sdl_type == NULL) { - zend_str_size_int ns_len = strlen(enc->details.ns); - zend_str_size_int type_len = strlen(enc->details.type_str); + php_size_t ns_len = strlen(enc->details.ns); + php_size_t type_len = strlen(enc->details.type_str); if (((ns_len == sizeof(SOAP_1_1_ENC_NAMESPACE)-1 && memcmp(enc->details.ns, SOAP_1_1_ENC_NAMESPACE, sizeof(SOAP_1_1_ENC_NAMESPACE)-1) == 0) || (ns_len == sizeof(SOAP_1_2_ENC_NAMESPACE)-1 && memcmp(enc->details.ns, SOAP_1_2_ENC_NAMESPACE, sizeof(SOAP_1_2_ENC_NAMESPACE)-1) == 0))) { char *enc_nscat; - zend_str_size_int enc_ns_len; - zend_str_size_int enc_len; + php_size_t enc_ns_len; + php_size_t enc_len; encodePtr real_enc; enc_ns_len = sizeof(XSD_NAMESPACE)-1; @@ -1800,7 +1800,7 @@ static void sdl_serialize_string(const char *str, smart_str *out) static void sdl_serialize_key(HashTable *ht, smart_str *out) { char *key; - zend_str_size_uint key_len; + php_size_t key_len; php_uint_t index; if (zend_hash_get_current_key_ex(ht, &key, &key_len, &index, 0, NULL) == HASH_KEY_IS_STRING) { @@ -2444,7 +2444,7 @@ static HashTable* make_persistent_sdl_function_headers(HashTable *headers, HashT sdlTypePtr *ptype; php_uint_t index; char *key; - zend_str_size_uint key_len; + php_size_t key_len; pheaders = malloc(sizeof(HashTable)); zend_hash_init(pheaders, zend_hash_num_elements(headers), NULL, delete_header_persistent, 1); @@ -2512,7 +2512,7 @@ static HashTable* make_persistent_sdl_parameters(HashTable *params, HashTable *p encodePtr *penc; php_uint_t index; char *key; - zend_str_size_uint key_len; + php_size_t key_len; pparams = malloc(sizeof(HashTable)); zend_hash_init(pparams, zend_hash_num_elements(params), NULL, delete_parameter_persistent, 1); @@ -2559,7 +2559,7 @@ static HashTable* make_persistent_sdl_function_faults(sdlFunctionPtr func, HashT sdlFaultPtr *tmp, pfault; php_uint_t index; char *key; - zend_str_size_uint key_len; + php_size_t key_len; pfaults = malloc(sizeof(HashTable)); zend_hash_init(pfaults, zend_hash_num_elements(faults), NULL, delete_fault_persistent, 1); @@ -2608,7 +2608,7 @@ static sdlAttributePtr make_persistent_sdl_attribute(sdlAttributePtr attr, HashT sdlAttributePtr pattr; php_uint_t index; char *key; - zend_str_size_uint key_len; + php_size_t key_len; pattr = malloc(sizeof(sdlAttribute)); memset(pattr, 0, sizeof(sdlAttribute)); @@ -2720,7 +2720,7 @@ static sdlTypePtr make_persistent_sdl_type(sdlTypePtr type, HashTable *ptr_map, { php_uint_t index; char *key; - zend_str_size_uint key_len; + php_size_t key_len; sdlTypePtr ptype = NULL; ptype = malloc(sizeof(sdlType)); @@ -2954,7 +2954,7 @@ static sdlPtr make_persistent_sdl(sdlPtr sdl TSRMLS_DC) HashTable bp_types, bp_encoders; php_uint_t index; char *key; - zend_str_size_uint key_len; + php_size_t key_len; zend_hash_init(&bp_types, 0, NULL, NULL, 0); zend_hash_init(&bp_encoders, 0, NULL, NULL, 0); @@ -3191,7 +3191,7 @@ sdlPtr get_sdl(zval *this_ptr, char *uri, php_int_t cache_wsdl TSRMLS_DC) char fn[MAXPATHLEN]; sdlPtr sdl = NULL; char* old_error_code = SOAP_GLOBAL(error_code); - zend_str_size_int uri_len = 0; + php_size_t uri_len = 0; php_stream_context *context=NULL; zval **tmp, **proxy_host, **proxy_port, *orig_context = NULL, *new_context = NULL; smart_str headers = {0}; @@ -3227,10 +3227,10 @@ sdlPtr get_sdl(zval *this_ptr, char *uri, php_int_t cache_wsdl TSRMLS_DC) char md5str[33]; PHP_MD5_CTX context; unsigned char digest[16]; - zend_str_size_int len = strlen(SOAP_GLOBAL(cache_dir)); + php_size_t len = strlen(SOAP_GLOBAL(cache_dir)); time_t cached; char *user = php_get_current_user(TSRMLS_C); - zend_str_size_int user_len = user ? strlen(user) + 1 : 0; + php_size_t user_len = user ? strlen(user) + 1 : 0; md5str[0] = '\0'; PHP_MD5Init(&context); @@ -3377,7 +3377,7 @@ cache_in_memory: HashPosition pos; time_t latest = t; char *key = NULL; - zend_str_size_uint key_len; + php_size_t key_len; php_uint_t idx; for (zend_hash_internal_pointer_reset_ex(SOAP_GLOBAL(mem_cache), &pos); -- 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/soap/php_sdl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ext/soap/php_sdl.c') diff --git a/ext/soap/php_sdl.c b/ext/soap/php_sdl.c index 7f41712703..19ae081168 100644 --- a/ext/soap/php_sdl.c +++ b/ext/soap/php_sdl.c @@ -3272,7 +3272,7 @@ sdlPtr get_sdl(zval *this_ptr, char *uri, php_int_t cache_wsdl TSRMLS_DC) if (zend_hash_find(Z_OBJPROP_P(this_ptr), "_proxy_host", sizeof("_proxy_host"), (void **) &proxy_host) == SUCCESS && Z_TYPE_PP(proxy_host) == IS_STRING && zend_hash_find(Z_OBJPROP_P(this_ptr), "_proxy_port", sizeof("_proxy_port"), (void **) &proxy_port) == SUCCESS && - Z_TYPE_PP(proxy_port) == IS_LONG) { + Z_TYPE_PP(proxy_port) == IS_INT) { zval str_port, *str_proxy; smart_str proxy = {0}; str_port = **proxy_port; -- 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/soap/php_sdl.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'ext/soap/php_sdl.c') diff --git a/ext/soap/php_sdl.c b/ext/soap/php_sdl.c index 8de779a5f7..e9c681a74f 100644 --- a/ext/soap/php_sdl.c +++ b/ext/soap/php_sdl.c @@ -292,9 +292,9 @@ void sdl_set_uri_credentials(sdlCtx *ctx, char *uri TSRMLS_DC) zval new_header; rest += 2; - ZVAL_STR(&new_header, STR_ALLOC(Z_STRLEN_P(header) - (rest - s), 0)); + ZVAL_STR(&new_header, STR_ALLOC(Z_STRSIZE_P(header) - (rest - s), 0)); memcpy(Z_STRVAL(new_header), Z_STRVAL_P(header), s - Z_STRVAL_P(header)); - memcpy(Z_STRVAL(new_header) + (s - Z_STRVAL_P(header)), rest, Z_STRLEN_P(header) - (rest - Z_STRVAL_P(header)) + 1); + memcpy(Z_STRVAL(new_header) + (s - Z_STRVAL_P(header)), rest, Z_STRSIZE_P(header) - (rest - Z_STRVAL_P(header)) + 1); ZVAL_COPY(&ctx->old_header, header); php_stream_context_set_option(ctx->context, "http", "header", &new_header); zval_dtor(&new_header); @@ -1805,7 +1805,7 @@ static void sdl_serialize_encoder_ref(encodePtr enc, HashTable *tmp_encoders, sm if (enc) { zval *encoder_num; if ((encoder_num = zend_hash_str_find(tmp_encoders, (char*)&enc, sizeof(enc))) != 0) { - WSDL_CACHE_PUT_INT(Z_LVAL_P(encoder_num), out); + WSDL_CACHE_PUT_INT(Z_IVAL_P(encoder_num), out); } else { WSDL_CACHE_PUT_INT(0, out); } @@ -1818,7 +1818,7 @@ static void sdl_serialize_type_ref(sdlTypePtr type, HashTable *tmp_types, smart_ if (type) { zval *type_num; if ((type_num = zend_hash_str_find(tmp_types, (char*)&type, sizeof(type))) != NULL) { - WSDL_CACHE_PUT_INT(Z_LVAL_P(type_num), out); + WSDL_CACHE_PUT_INT(Z_IVAL_P(type_num), out); } else { WSDL_CACHE_PUT_INT(0, out); } @@ -1974,7 +1974,7 @@ static void sdl_serialize_type(sdlTypePtr type, HashTable *tmp_encoders, HashTab ZEND_HASH_FOREACH_STR_KEY_PTR(type->elements, key, tmp) { sdl_serialize_key(key, out); sdl_serialize_type(tmp, tmp_encoders, tmp_types, out); - ZVAL_LONG(&zv, i); + ZVAL_INT(&zv, i); zend_hash_str_add(tmp_elements, (char*)&tmp, sizeof(tmp), &zv); i--; } ZEND_HASH_FOREACH_END(); @@ -2140,7 +2140,7 @@ static void add_sdl_to_cache(const char *fn, const char *uri, time_t t, sdlPtr s zval zv; ZEND_HASH_FOREACH_PTR(sdl->groups, tmp) { - ZVAL_LONG(&zv, type_num); + ZVAL_INT(&zv, type_num); zend_hash_str_add(&tmp_types, (char*)&tmp, sizeof(tmp), &zv); ++type_num; } ZEND_HASH_FOREACH_END(); @@ -2157,7 +2157,7 @@ static void add_sdl_to_cache(const char *fn, const char *uri, time_t t, sdlPtr s zval zv; ZEND_HASH_FOREACH_PTR(sdl->types, tmp) { - ZVAL_LONG(&zv, type_num); + ZVAL_INT(&zv, type_num); zend_hash_str_add(&tmp_types, (char*)&tmp, sizeof(tmp), &zv); ++type_num; } ZEND_HASH_FOREACH_END(); @@ -2174,7 +2174,7 @@ static void add_sdl_to_cache(const char *fn, const char *uri, time_t t, sdlPtr s zval zv; ZEND_HASH_FOREACH_PTR(sdl->elements, tmp) { - ZVAL_LONG(&zv, type_num); + ZVAL_INT(&zv, type_num); zend_hash_str_add(&tmp_types, (char*)&tmp, sizeof(tmp), &zv); ++type_num; } ZEND_HASH_FOREACH_END(); @@ -2191,7 +2191,7 @@ static void add_sdl_to_cache(const char *fn, const char *uri, time_t t, sdlPtr s zval zv; ZEND_HASH_FOREACH_PTR(sdl->encoders, tmp) { - ZVAL_LONG(&zv, encoder_num); + ZVAL_INT(&zv, encoder_num); zend_hash_str_add(&tmp_encoders, (char*)&tmp, sizeof(tmp), &zv); ++encoder_num; } ZEND_HASH_FOREACH_END(); @@ -2200,7 +2200,7 @@ static void add_sdl_to_cache(const char *fn, const char *uri, time_t t, sdlPtr s while (enc->details.type != END_KNOWN_TYPES) { zval zv; - ZVAL_LONG(&zv, encoder_num); + ZVAL_INT(&zv, encoder_num); zend_hash_str_add(&tmp_encoders, (char*)&enc, sizeof(encodePtr), &zv); enc++; ++encoder_num; @@ -2272,7 +2272,7 @@ static void add_sdl_to_cache(const char *fn, const char *uri, time_t t, sdlPtr s WSDL_CACHE_PUT_1(0,out); } - ZVAL_LONG(&zv, binding_num); + ZVAL_INT(&zv, binding_num); zend_hash_str_add(&tmp_bindings, (char*)&tmp, sizeof(tmp), &zv); binding_num++; } ZEND_HASH_FOREACH_END(); @@ -2296,8 +2296,8 @@ static void add_sdl_to_cache(const char *fn, const char *uri, time_t t, sdlPtr s if (tmp->binding) { binding_num = zend_hash_str_find(&tmp_bindings,(char*)&tmp->binding, sizeof(tmp->binding)); if (binding_num) { - WSDL_CACHE_PUT_INT(Z_LVAL_P(binding_num), out); - if (Z_LVAL_P(binding_num) >= 0) { + WSDL_CACHE_PUT_INT(Z_IVAL_P(binding_num), out); + if (Z_IVAL_P(binding_num) >= 0) { if (tmp->binding->bindingType == BINDING_SOAP && tmp->bindingAttributes != NULL) { sdlSoapBindingFunctionPtr binding = (sdlSoapBindingFunctionPtr)tmp->bindingAttributes; WSDL_CACHE_PUT_1(binding->style, out); @@ -2338,7 +2338,7 @@ static void add_sdl_to_cache(const char *fn, const char *uri, time_t t, sdlPtr s WSDL_CACHE_PUT_INT(0, out); } - ZVAL_LONG(&zv, function_num); + ZVAL_INT(&zv, function_num); zend_hash_str_add(&tmp_functions, (char*)&tmp, sizeof(tmp), &zv); function_num++; } ZEND_HASH_FOREACH_END(); @@ -2358,7 +2358,7 @@ static void add_sdl_to_cache(const char *fn, const char *uri, time_t t, sdlPtr s ZEND_HASH_FOREACH_STR_KEY_PTR(sdl->requests, key, tmp) { function_num = zend_hash_str_find(&tmp_functions, (char*)&tmp, sizeof(tmp)); - WSDL_CACHE_PUT_INT(Z_LVAL_P(function_num), out); + WSDL_CACHE_PUT_INT(Z_IVAL_P(function_num), out); sdl_serialize_key(key, out); } ZEND_HASH_FOREACH_END(); } @@ -3230,7 +3230,7 @@ sdlPtr get_sdl(zval *this_ptr, char *uri, long cache_wsdl TSRMLS_DC) } if ((tmp = zend_hash_str_find(Z_OBJPROP_P(this_ptr), "_user_agent", sizeof("_user_agent")-1)) != NULL && - Z_TYPE_P(tmp) == IS_STRING && Z_STRLEN_P(tmp) > 0) { + Z_TYPE_P(tmp) == IS_STRING && Z_STRSIZE_P(tmp) > 0) { smart_str_appends(&headers, "User-Agent: "); smart_str_appends(&headers, Z_STRVAL_P(tmp)); smart_str_appends(&headers, "\r\n"); @@ -3239,7 +3239,7 @@ sdlPtr get_sdl(zval *this_ptr, char *uri, long cache_wsdl TSRMLS_DC) if ((proxy_host = zend_hash_str_find(Z_OBJPROP_P(this_ptr), "_proxy_host", sizeof("_proxy_host")-1)) != NULL && Z_TYPE_P(proxy_host) == IS_STRING && (proxy_port = zend_hash_str_find(Z_OBJPROP_P(this_ptr), "_proxy_port", sizeof("_proxy_port")-1)) != NULL && - Z_TYPE_P(proxy_port) == IS_LONG) { + Z_TYPE_P(proxy_port) == IS_INT) { zval str_port, str_proxy; smart_str proxy = {0}; ZVAL_DUP(&str_port, proxy_port); -- cgit v1.2.1 From 094441f1029c6d3e7a4baca664045e9be66bd9b8 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Tue, 19 Aug 2014 13:49:48 +0200 Subject: ported ext/soap --- ext/soap/php_sdl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ext/soap/php_sdl.c') diff --git a/ext/soap/php_sdl.c b/ext/soap/php_sdl.c index e9c681a74f..6daa8dbafe 100644 --- a/ext/soap/php_sdl.c +++ b/ext/soap/php_sdl.c @@ -3151,7 +3151,7 @@ static void delete_psdl(zval *zv) free(Z_PTR_P(zv)); } -sdlPtr get_sdl(zval *this_ptr, char *uri, long cache_wsdl TSRMLS_DC) +sdlPtr get_sdl(zval *this_ptr, char *uri, php_int_t cache_wsdl TSRMLS_DC) { char fn[MAXPATHLEN]; sdlPtr sdl = NULL; -- 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/soap/php_sdl.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) (limited to 'ext/soap/php_sdl.c') diff --git a/ext/soap/php_sdl.c b/ext/soap/php_sdl.c index 6daa8dbafe..456fe59584 100644 --- a/ext/soap/php_sdl.c +++ b/ext/soap/php_sdl.c @@ -292,9 +292,9 @@ void sdl_set_uri_credentials(sdlCtx *ctx, char *uri TSRMLS_DC) zval new_header; rest += 2; - ZVAL_STR(&new_header, STR_ALLOC(Z_STRSIZE_P(header) - (rest - s), 0)); + ZVAL_STR(&new_header, zend_string_alloc(Z_STRLEN_P(header) - (rest - s), 0)); memcpy(Z_STRVAL(new_header), Z_STRVAL_P(header), s - Z_STRVAL_P(header)); - memcpy(Z_STRVAL(new_header) + (s - Z_STRVAL_P(header)), rest, Z_STRSIZE_P(header) - (rest - Z_STRVAL_P(header)) + 1); + memcpy(Z_STRVAL(new_header) + (s - Z_STRVAL_P(header)), rest, Z_STRLEN_P(header) - (rest - Z_STRVAL_P(header)) + 1); ZVAL_COPY(&ctx->old_header, header); php_stream_context_set_option(ctx->context, "http", "header", &new_header); zval_dtor(&new_header); @@ -1805,7 +1805,7 @@ static void sdl_serialize_encoder_ref(encodePtr enc, HashTable *tmp_encoders, sm if (enc) { zval *encoder_num; if ((encoder_num = zend_hash_str_find(tmp_encoders, (char*)&enc, sizeof(enc))) != 0) { - WSDL_CACHE_PUT_INT(Z_IVAL_P(encoder_num), out); + WSDL_CACHE_PUT_INT(Z_LVAL_P(encoder_num), out); } else { WSDL_CACHE_PUT_INT(0, out); } @@ -1818,7 +1818,7 @@ static void sdl_serialize_type_ref(sdlTypePtr type, HashTable *tmp_types, smart_ if (type) { zval *type_num; if ((type_num = zend_hash_str_find(tmp_types, (char*)&type, sizeof(type))) != NULL) { - WSDL_CACHE_PUT_INT(Z_IVAL_P(type_num), out); + WSDL_CACHE_PUT_INT(Z_LVAL_P(type_num), out); } else { WSDL_CACHE_PUT_INT(0, out); } @@ -1974,7 +1974,7 @@ static void sdl_serialize_type(sdlTypePtr type, HashTable *tmp_encoders, HashTab ZEND_HASH_FOREACH_STR_KEY_PTR(type->elements, key, tmp) { sdl_serialize_key(key, out); sdl_serialize_type(tmp, tmp_encoders, tmp_types, out); - ZVAL_INT(&zv, i); + ZVAL_LONG(&zv, i); zend_hash_str_add(tmp_elements, (char*)&tmp, sizeof(tmp), &zv); i--; } ZEND_HASH_FOREACH_END(); @@ -2140,7 +2140,7 @@ static void add_sdl_to_cache(const char *fn, const char *uri, time_t t, sdlPtr s zval zv; ZEND_HASH_FOREACH_PTR(sdl->groups, tmp) { - ZVAL_INT(&zv, type_num); + ZVAL_LONG(&zv, type_num); zend_hash_str_add(&tmp_types, (char*)&tmp, sizeof(tmp), &zv); ++type_num; } ZEND_HASH_FOREACH_END(); @@ -2157,7 +2157,7 @@ static void add_sdl_to_cache(const char *fn, const char *uri, time_t t, sdlPtr s zval zv; ZEND_HASH_FOREACH_PTR(sdl->types, tmp) { - ZVAL_INT(&zv, type_num); + ZVAL_LONG(&zv, type_num); zend_hash_str_add(&tmp_types, (char*)&tmp, sizeof(tmp), &zv); ++type_num; } ZEND_HASH_FOREACH_END(); @@ -2174,7 +2174,7 @@ static void add_sdl_to_cache(const char *fn, const char *uri, time_t t, sdlPtr s zval zv; ZEND_HASH_FOREACH_PTR(sdl->elements, tmp) { - ZVAL_INT(&zv, type_num); + ZVAL_LONG(&zv, type_num); zend_hash_str_add(&tmp_types, (char*)&tmp, sizeof(tmp), &zv); ++type_num; } ZEND_HASH_FOREACH_END(); @@ -2191,7 +2191,7 @@ static void add_sdl_to_cache(const char *fn, const char *uri, time_t t, sdlPtr s zval zv; ZEND_HASH_FOREACH_PTR(sdl->encoders, tmp) { - ZVAL_INT(&zv, encoder_num); + ZVAL_LONG(&zv, encoder_num); zend_hash_str_add(&tmp_encoders, (char*)&tmp, sizeof(tmp), &zv); ++encoder_num; } ZEND_HASH_FOREACH_END(); @@ -2200,7 +2200,7 @@ static void add_sdl_to_cache(const char *fn, const char *uri, time_t t, sdlPtr s while (enc->details.type != END_KNOWN_TYPES) { zval zv; - ZVAL_INT(&zv, encoder_num); + ZVAL_LONG(&zv, encoder_num); zend_hash_str_add(&tmp_encoders, (char*)&enc, sizeof(encodePtr), &zv); enc++; ++encoder_num; @@ -2272,7 +2272,7 @@ static void add_sdl_to_cache(const char *fn, const char *uri, time_t t, sdlPtr s WSDL_CACHE_PUT_1(0,out); } - ZVAL_INT(&zv, binding_num); + ZVAL_LONG(&zv, binding_num); zend_hash_str_add(&tmp_bindings, (char*)&tmp, sizeof(tmp), &zv); binding_num++; } ZEND_HASH_FOREACH_END(); @@ -2296,8 +2296,8 @@ static void add_sdl_to_cache(const char *fn, const char *uri, time_t t, sdlPtr s if (tmp->binding) { binding_num = zend_hash_str_find(&tmp_bindings,(char*)&tmp->binding, sizeof(tmp->binding)); if (binding_num) { - WSDL_CACHE_PUT_INT(Z_IVAL_P(binding_num), out); - if (Z_IVAL_P(binding_num) >= 0) { + WSDL_CACHE_PUT_INT(Z_LVAL_P(binding_num), out); + if (Z_LVAL_P(binding_num) >= 0) { if (tmp->binding->bindingType == BINDING_SOAP && tmp->bindingAttributes != NULL) { sdlSoapBindingFunctionPtr binding = (sdlSoapBindingFunctionPtr)tmp->bindingAttributes; WSDL_CACHE_PUT_1(binding->style, out); @@ -2338,7 +2338,7 @@ static void add_sdl_to_cache(const char *fn, const char *uri, time_t t, sdlPtr s WSDL_CACHE_PUT_INT(0, out); } - ZVAL_INT(&zv, function_num); + ZVAL_LONG(&zv, function_num); zend_hash_str_add(&tmp_functions, (char*)&tmp, sizeof(tmp), &zv); function_num++; } ZEND_HASH_FOREACH_END(); @@ -2358,7 +2358,7 @@ static void add_sdl_to_cache(const char *fn, const char *uri, time_t t, sdlPtr s ZEND_HASH_FOREACH_STR_KEY_PTR(sdl->requests, key, tmp) { function_num = zend_hash_str_find(&tmp_functions, (char*)&tmp, sizeof(tmp)); - WSDL_CACHE_PUT_INT(Z_IVAL_P(function_num), out); + WSDL_CACHE_PUT_INT(Z_LVAL_P(function_num), out); sdl_serialize_key(key, out); } ZEND_HASH_FOREACH_END(); } @@ -3151,7 +3151,7 @@ static void delete_psdl(zval *zv) free(Z_PTR_P(zv)); } -sdlPtr get_sdl(zval *this_ptr, char *uri, php_int_t cache_wsdl TSRMLS_DC) +sdlPtr get_sdl(zval *this_ptr, char *uri, zend_long cache_wsdl TSRMLS_DC) { char fn[MAXPATHLEN]; sdlPtr sdl = NULL; @@ -3230,7 +3230,7 @@ sdlPtr get_sdl(zval *this_ptr, char *uri, php_int_t cache_wsdl TSRMLS_DC) } if ((tmp = zend_hash_str_find(Z_OBJPROP_P(this_ptr), "_user_agent", sizeof("_user_agent")-1)) != NULL && - Z_TYPE_P(tmp) == IS_STRING && Z_STRSIZE_P(tmp) > 0) { + Z_TYPE_P(tmp) == IS_STRING && Z_STRLEN_P(tmp) > 0) { smart_str_appends(&headers, "User-Agent: "); smart_str_appends(&headers, Z_STRVAL_P(tmp)); smart_str_appends(&headers, "\r\n"); @@ -3239,7 +3239,7 @@ sdlPtr get_sdl(zval *this_ptr, char *uri, php_int_t cache_wsdl TSRMLS_DC) if ((proxy_host = zend_hash_str_find(Z_OBJPROP_P(this_ptr), "_proxy_host", sizeof("_proxy_host")-1)) != NULL && Z_TYPE_P(proxy_host) == IS_STRING && (proxy_port = zend_hash_str_find(Z_OBJPROP_P(this_ptr), "_proxy_port", sizeof("_proxy_port")-1)) != NULL && - Z_TYPE_P(proxy_port) == IS_INT) { + Z_TYPE_P(proxy_port) == IS_LONG) { zval str_port, str_proxy; smart_str proxy = {0}; ZVAL_DUP(&str_port, proxy_port); @@ -3250,7 +3250,7 @@ sdlPtr get_sdl(zval *this_ptr, char *uri, php_int_t cache_wsdl TSRMLS_DC) smart_str_appends(&proxy,Z_STRVAL(str_port)); smart_str_0(&proxy); zval_dtor(&str_port); - ZVAL_STR(&str_proxy, STR_COPY(proxy.s)); + ZVAL_STR(&str_proxy, zend_string_copy(proxy.s)); smart_str_free(&proxy); if (!context) { @@ -3289,7 +3289,7 @@ sdlPtr get_sdl(zval *this_ptr, char *uri, php_int_t cache_wsdl TSRMLS_DC) } smart_str_0(&headers); - ZVAL_STR(&str_headers, STR_COPY(headers.s)); + ZVAL_STR(&str_headers, zend_string_copy(headers.s)); php_stream_context_set_option(context, "http", "header", &str_headers); smart_str_free(&headers); zval_ptr_dtor(&str_headers); -- cgit v1.2.1 From c7206771628c2119eb10444148e936265971ca33 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Thu, 4 Sep 2014 22:49:56 +0200 Subject: Fix SOAP warnings --- ext/soap/php_sdl.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'ext/soap/php_sdl.c') diff --git a/ext/soap/php_sdl.c b/ext/soap/php_sdl.c index 456fe59584..587695b943 100644 --- a/ext/soap/php_sdl.c +++ b/ext/soap/php_sdl.c @@ -975,7 +975,7 @@ static sdlPtr load_wsdl(zval *this_ptr, char *struri TSRMLS_DC) input = get_node_ex(portTypeOperation->children, "input", WSDL_NAMESPACE); if (input != NULL) { - xmlAttrPtr message, name; + xmlAttrPtr message; message = get_attribute(input->properties, "message"); if (message == NULL) { @@ -983,8 +983,8 @@ static sdlPtr load_wsdl(zval *this_ptr, char *struri TSRMLS_DC) } function->requestParameters = wsdl_message(&ctx, message->children->content); - name = get_attribute(input->properties, "name"); /* FIXME + xmlAttrPtr name = get_attribute(input->properties, "name"); if (name != NULL) { function->requestName = estrdup(name->children->content); } else { @@ -1004,7 +1004,7 @@ static sdlPtr load_wsdl(zval *this_ptr, char *struri TSRMLS_DC) output = get_node_ex(portTypeOperation->children, "output", WSDL_NAMESPACE); if (output != NULL) { - xmlAttrPtr message, name; + xmlAttrPtr message; message = get_attribute(output->properties, "message"); if (message == NULL) { @@ -1012,8 +1012,8 @@ static sdlPtr load_wsdl(zval *this_ptr, char *struri TSRMLS_DC) } function->responseParameters = wsdl_message(&ctx, message->children->content); - name = get_attribute(output->properties, "name"); /* FIXME + xmlAttrPtr name = get_attribute(output->properties, "name"); if (name != NULL) { function->responseName = estrdup(name->children->content); } else if (input == NULL) { -- cgit v1.2.1