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_schema.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'ext/soap/php_schema.c') diff --git a/ext/soap/php_schema.c b/ext/soap/php_schema.c index 25bb177273..db511624d2 100644 --- a/ext/soap/php_schema.c +++ b/ext/soap/php_schema.c @@ -2141,7 +2141,7 @@ static void schema_attributegroup_fixup(sdlCtx *ctx, sdlAttributePtr attr, HashT while (zend_hash_get_current_data((*tmp)->attributes,(void**)&tmp_attr) == SUCCESS) { if (zend_hash_get_current_key_type((*tmp)->attributes) == HASH_KEY_IS_STRING) { char* key; - uint key_len; + zend_str_size_uint key_len; sdlAttributePtr newAttr; schema_attribute_fixup(ctx,*tmp_attr); @@ -2165,7 +2165,7 @@ static void schema_attributegroup_fixup(sdlCtx *ctx, sdlAttributePtr attr, HashT zend_hash_move_forward((*tmp)->attributes); } else { - ulong index; + php_uint_t index; schema_attributegroup_fixup(ctx,*tmp_attr, ht); zend_hash_get_current_key((*tmp)->attributes, NULL, &index, 0); @@ -2276,7 +2276,7 @@ static void schema_type_fixup(sdlCtx *ctx, sdlTypePtr type) schema_attribute_fixup(ctx,*attr); zend_hash_move_forward(type->attributes); } else { - ulong index; + php_uint_t index; schema_attributegroup_fixup(ctx,*attr,type->attributes); zend_hash_get_current_key(type->attributes, NULL, &index, 0); -- 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_schema.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ext/soap/php_schema.c') diff --git a/ext/soap/php_schema.c b/ext/soap/php_schema.c index db511624d2..83c250db22 100644 --- a/ext/soap/php_schema.c +++ b/ext/soap/php_schema.c @@ -2141,7 +2141,7 @@ static void schema_attributegroup_fixup(sdlCtx *ctx, sdlAttributePtr attr, HashT while (zend_hash_get_current_data((*tmp)->attributes,(void**)&tmp_attr) == SUCCESS) { if (zend_hash_get_current_key_type((*tmp)->attributes) == HASH_KEY_IS_STRING) { char* key; - zend_str_size_uint key_len; + php_size_t key_len; sdlAttributePtr newAttr; schema_attribute_fixup(ctx,*tmp_attr); -- cgit v1.2.1 From f2fc935502b110b7a706d1641c000a9e9500315b Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Thu, 19 Dec 2013 23:28:52 -0800 Subject: next wave on semantical replacements long vs. int --- ext/soap/php_schema.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'ext/soap/php_schema.c') diff --git a/ext/soap/php_schema.c b/ext/soap/php_schema.c index 83c250db22..ae91b19a59 100644 --- a/ext/soap/php_schema.c +++ b/ext/soap/php_schema.c @@ -460,7 +460,7 @@ static int schema_list(sdlPtr sdl, xmlAttrPtr tns, xmlNodePtr listType, sdlTypeP smart_str anonymous = {0}; smart_str_appendl(&anonymous, "anonymous", sizeof("anonymous")-1); - smart_str_append_long(&anonymous, zend_hash_num_elements(sdl->types)); + smart_str_append_int(&anonymous, zend_hash_num_elements(sdl->types)); smart_str_0(&anonymous); newType->name = anonymous.c; } @@ -556,7 +556,7 @@ static int schema_union(sdlPtr sdl, xmlAttrPtr tns, xmlNodePtr unionType, sdlTyp smart_str anonymous = {0}; smart_str_appendl(&anonymous, "anonymous", sizeof("anonymous")-1); - smart_str_append_long(&anonymous, zend_hash_num_elements(sdl->types)); + smart_str_append_int(&anonymous, zend_hash_num_elements(sdl->types)); smart_str_0(&anonymous); newType->name = anonymous.c; } @@ -1925,7 +1925,7 @@ static int schema_attribute(sdlPtr sdl, xmlAttrPtr tns, xmlNodePtr attrType, sdl smart_str anonymous = {0}; smart_str_appendl(&anonymous, "anonymous", sizeof("anonymous")-1); - smart_str_append_long(&anonymous, zend_hash_num_elements(sdl->types)); + smart_str_append_int(&anonymous, zend_hash_num_elements(sdl->types)); smart_str_0(&anonymous); dummy_type->name = anonymous.c; } -- 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_schema.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'ext/soap/php_schema.c') diff --git a/ext/soap/php_schema.c b/ext/soap/php_schema.c index 5ba3bd3de5..b1fb8935b4 100644 --- a/ext/soap/php_schema.c +++ b/ext/soap/php_schema.c @@ -460,7 +460,7 @@ static int schema_list(sdlPtr sdl, xmlAttrPtr tns, xmlNodePtr listType, sdlTypeP smart_str anonymous = {0}; smart_str_appendl(&anonymous, "anonymous", sizeof("anonymous")-1); - smart_str_append_long(&anonymous, zend_hash_num_elements(sdl->types)); + smart_str_append_int(&anonymous, zend_hash_num_elements(sdl->types)); smart_str_0(&anonymous); // TODO: avoid reallocation ??? newType->name = estrndup(anonymous.s->val, anonymous.s->len); @@ -558,7 +558,7 @@ static int schema_union(sdlPtr sdl, xmlAttrPtr tns, xmlNodePtr unionType, sdlTyp smart_str anonymous = {0}; smart_str_appendl(&anonymous, "anonymous", sizeof("anonymous")-1); - smart_str_append_long(&anonymous, zend_hash_num_elements(sdl->types)); + smart_str_append_int(&anonymous, zend_hash_num_elements(sdl->types)); smart_str_0(&anonymous); // TODO: avoid reallocation ??? newType->name = estrndup(anonymous.s->val, anonymous.s->len); @@ -1931,7 +1931,7 @@ static int schema_attribute(sdlPtr sdl, xmlAttrPtr tns, xmlNodePtr attrType, sdl smart_str anonymous = {0}; smart_str_appendl(&anonymous, "anonymous", sizeof("anonymous")-1); - smart_str_append_long(&anonymous, zend_hash_num_elements(sdl->types)); + smart_str_append_int(&anonymous, zend_hash_num_elements(sdl->types)); smart_str_0(&anonymous); // TODO: avoid reallocation ??? dummy_type->name = estrndup(anonymous.s->val, anonymous.s->len); -- 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_schema.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ext/soap/php_schema.c') diff --git a/ext/soap/php_schema.c b/ext/soap/php_schema.c index b1fb8935b4..9145390ca3 100644 --- a/ext/soap/php_schema.c +++ b/ext/soap/php_schema.c @@ -2169,7 +2169,7 @@ static void schema_attributegroup_fixup(sdlCtx *ctx, sdlAttributePtr attr, HashT zend_hash_move_forward(tmp->attributes); } else { - ulong index; + php_uint_t index; schema_attributegroup_fixup(ctx, tmp_attr, ht); zend_hash_get_current_key(tmp->attributes, NULL, &index, 0); @@ -2268,7 +2268,7 @@ static void schema_type_fixup(sdlCtx *ctx, sdlTypePtr type) } if (type->attributes) { zend_string *str_key; - ulong index; + php_uint_t index; ZEND_HASH_FOREACH_KEY_PTR(type->attributes, index, str_key, attr) { if (str_key) { -- 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_schema.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'ext/soap/php_schema.c') diff --git a/ext/soap/php_schema.c b/ext/soap/php_schema.c index 9145390ca3..2c4c6c9189 100644 --- a/ext/soap/php_schema.c +++ b/ext/soap/php_schema.c @@ -460,7 +460,7 @@ static int schema_list(sdlPtr sdl, xmlAttrPtr tns, xmlNodePtr listType, sdlTypeP smart_str anonymous = {0}; smart_str_appendl(&anonymous, "anonymous", sizeof("anonymous")-1); - smart_str_append_int(&anonymous, zend_hash_num_elements(sdl->types)); + smart_str_append_long(&anonymous, zend_hash_num_elements(sdl->types)); smart_str_0(&anonymous); // TODO: avoid reallocation ??? newType->name = estrndup(anonymous.s->val, anonymous.s->len); @@ -558,7 +558,7 @@ static int schema_union(sdlPtr sdl, xmlAttrPtr tns, xmlNodePtr unionType, sdlTyp smart_str anonymous = {0}; smart_str_appendl(&anonymous, "anonymous", sizeof("anonymous")-1); - smart_str_append_int(&anonymous, zend_hash_num_elements(sdl->types)); + smart_str_append_long(&anonymous, zend_hash_num_elements(sdl->types)); smart_str_0(&anonymous); // TODO: avoid reallocation ??? newType->name = estrndup(anonymous.s->val, anonymous.s->len); @@ -1931,7 +1931,7 @@ static int schema_attribute(sdlPtr sdl, xmlAttrPtr tns, xmlNodePtr attrType, sdl smart_str anonymous = {0}; smart_str_appendl(&anonymous, "anonymous", sizeof("anonymous")-1); - smart_str_append_int(&anonymous, zend_hash_num_elements(sdl->types)); + smart_str_append_long(&anonymous, zend_hash_num_elements(sdl->types)); smart_str_0(&anonymous); // TODO: avoid reallocation ??? dummy_type->name = estrndup(anonymous.s->val, anonymous.s->len); @@ -2169,7 +2169,7 @@ static void schema_attributegroup_fixup(sdlCtx *ctx, sdlAttributePtr attr, HashT zend_hash_move_forward(tmp->attributes); } else { - php_uint_t index; + zend_ulong index; schema_attributegroup_fixup(ctx, tmp_attr, ht); zend_hash_get_current_key(tmp->attributes, NULL, &index, 0); @@ -2268,7 +2268,7 @@ static void schema_type_fixup(sdlCtx *ctx, sdlTypePtr type) } if (type->attributes) { zend_string *str_key; - php_uint_t index; + zend_ulong index; ZEND_HASH_FOREACH_KEY_PTR(type->attributes, index, str_key, attr) { if (str_key) { -- cgit v1.2.1