com php-src: finer fixes to ext/soap: ext/soap/php_encoding .c ext/soap/php_encoding.h ext/soap/php_http.c ext/soap/php_sdl.c ext/soap/php_sdl.h
ext/soap/soap .c

Commit: e094c64b6765e2f70dedb780fe486c67a86bcbe9 Author: Anatol Belski <ab@php.net> Fri, 29 Nov 2013 20:26:07 +0100 Parents: 9a834807bcd6e88e2ff12b6b466bbfb1ca9b2166 Branches: str_size_and_int64 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e094c64b6765e2f70dedb780fe486c67a86bcbe9 Log: finer fixes to ext/soap Changed paths: M ext/soap/php_encoding.c M ext/soap/php_encoding.h M ext/soap/php_http.c M ext/soap/php_sdl.c M ext/soap/php_sdl.h M ext/soap/soap.c Diff: diff --git a/ext/soap/php_encoding.c b/ext/soap/php_encoding.c index f1f1b5d..b3a900e 100644 --- a/ext/soap/php_encoding.c +++ b/ext/soap/php_encoding.c @@ -815,7 +815,7 @@ static zval *to_zval_hexbin(encodeTypePtr type, xmlNodePtr data TSRMLS_DC) { zval *ret; unsigned char *str; - int str_len, i, j; + size_t str_len, i, j; unsigned char c; MAKE_STD_ZVAL(ret); @@ -3584,7 +3584,7 @@ void encode_finish() } } -encodePtr get_conversion(int encode) +encodePtr get_conversion(php_int_t encode) { encodePtr *enc = NULL; TSRMLS_FETCH(); diff --git a/ext/soap/php_encoding.h b/ext/soap/php_encoding.h index 31a8469..d7817d5 100644 --- a/ext/soap/php_encoding.h +++ b/ext/soap/php_encoding.h @@ -205,7 +205,7 @@ void encode_finish(); void encode_reset_ns(); xmlNsPtr encode_add_ns(xmlNodePtr node, const char* ns); -encodePtr get_conversion(int encode); +encodePtr get_conversion(php_int_t encode); void delete_encoder(void *handle); void delete_encoder_persistent(void *handle); diff --git a/ext/soap/php_http.c b/ext/soap/php_http.c index 56d68a6..6f64fe7 100644 --- a/ext/soap/php_http.c +++ b/ext/soap/php_http.c @@ -100,7 +100,7 @@ void http_context_headers(php_stream_context* context, Z_TYPE_PP(tmp) == IS_STRING && Z_STRSIZE_PP(tmp)) { char *s = Z_STRVAL_PP(tmp); char *p; - int name_len; + ptrdiff_t name_len; while (*s) { /* skip leading newlines and spaces */ @@ -807,7 +807,7 @@ try_again: if (zend_hash_find(Z_OBJPROP_P(this_ptr), "_cookies", sizeof("_cookies"), (void **)&cookies) == SUCCESS) { zval **data; char *key; - uint key_len; + zend_str_size_uint key_len; int i, n; has_cookies = 1; @@ -956,7 +956,7 @@ try_again: sempos = strstr(cookie, ";"); if (eqpos != NULL && (sempos == NULL || sempos > eqpos)) { smart_str name = {0}; - int cookie_len; + ptrdiff_t cookie_len; zval *zcookie; if (sempos != NULL) { @@ -1208,7 +1208,7 @@ try_again: content_type = get_http_header_value(http_headers,"Content-Type: "); if (content_type) { char *pos = NULL; - int cmplen; + ptrdiff_t cmplen; pos = strstr(content_type,";"); if (pos != NULL) { cmplen = pos - content_type; diff --git a/ext/soap/php_sdl..c b/ext/soap/php_sdl.c index 0c93aad..f9e31ab 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(); diff --git a/ext/soap/php_sdl.h b/ext/soap/php_sdl.h index 63a9c91..d3f5e2b 100644 --- a/ext/soap/php_sdl.h +++ b/ext/soap/php_sdl.h @@ -258,7 +258,7 @@ sdlPtr get_sdl(zval *this_ptr, char *uri, php_int_t cache_wsdl TSRMLS_DC); encodePtr get_encoder_from_prefix(sdlPtr sdl, xmlNodePtr data, const xmlChar *type); encodePtr get_encoder(sdlPtr sdl, const char *ns, const char *type); -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); sdlBindingPtr get_binding_from_type(sdlPtr sdl, int type); sdlBindingPtr get_binding_from_name(sdlPtr sdl, char *name, char *ns); diff --git a/ext/soap/soap.c b/ext/soap/soap.c index d6df066..60f2ee4 100644 --- a/ext/soap/soap.c +++ b/ext/soap/soap.c @@ -68,7 +68,7 @@ static void delete_service(void *service); static void delete_url(void *handle); static void delete_hashtable(void *hashtable); -static void soap_error_handler(int error_num, const char *error_filename, const uint error_lineno, const char *format, va_list args); +static void soap_error_handler(int error_num, const char *error_filename, const zend_str_size_uint error_lineno, const char *format, va_list args); #define SOAP_SERVER_BEGIN_CODE() \ zend_bool _old_handler = SOAP_GLOBAL(use_soap_error_handler);\ @@ -1705,7 +1705,7 @@ PHP_METHOD(SoapServer, handle) zval_dtor(&constructor); zval_dtor(&c_ret); } else { - int class_name_len = strlen(service->soap_class.ce->name); + size_t class_name_len = strlen(service->soap_class.ce->name); char *class_name = emalloc(class_name_len+1); memcpy(class_name, service->soap_class.ce->name,class_name_len+1); @@ -2110,7 +2110,7 @@ static void soap_server_fault(char* code, char* string, char *actor, zval* detai zend_bailout(); } -static void soap_error_handler(int error_num, const char *error_filename, const uint error_lineno, const char *format, va_list args) +static void soap_error_handler(int error_num, const char *error_filename, const zend_str_size_uint error_lineno, const char *format, va_list args) { zend_bool _old_in_compilation, _old_in_execution; zend_execute_data *_old_current_execute_data; @@ -4472,7 +4472,7 @@ static sdlFunctionPtr get_function(sdlPtr sdl, const char *function_name) { sdlFunctionPtr *tmp; - int len = strlen(function_name); + zend_str_size_int len = strlen(function_name); char *str = estrndup(function_name,len); php_strtolower(str,len); if (sdl != NULL) { @@ -4714,7 +4714,7 @@ static void type_to_string(sdlTypePtr type, smart_str *buf, int level) (void **)&attr) == SUCCESS && zend_hash_find((*attr)->extraAttributes, WSDL_NAMESPACE":arrayType", sizeof(WSDL_NAMESPACE":arrayType"), (void **)&ext) == SUCCESS) { char *end = strchr((*ext)->val, '['); - int len; + ptrdiff_t len; if (end == NULL) { len = strlen((*ext)->val); } else {