Skip to content

Commit ca2b131

Browse files
GirgiasGirgias
committed
ext/soap: mark string param of sdl_serialize_key() as const
Add const qualifiers to the variables at the call size Rename variables when they were shadowing a variable from the outer scope
1 parent 325f8f0 commit ca2b131

File tree

1 file changed

+20
-20
lines changed

1 file changed

+20
-20
lines changed

‎ext/soap/php_sdl.c

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1785,7 +1785,7 @@ static void sdl_serialize_string(const char *str, smart_str *out)
17851785
}
17861786

17871787
// TODO: refactor it
1788-
static void sdl_serialize_key(zend_string *key, smart_str *out)
1788+
static void sdl_serialize_key(const zend_string *key, smart_str *out)
17891789
{
17901790
if (key) {
17911791
WSDL_CACHE_PUT_INT(ZSTR_LEN(key), out);
@@ -1841,7 +1841,7 @@ static void sdl_serialize_attribute(sdlAttributePtr attr, HashTable *tmp_encoder
18411841
WSDL_CACHE_PUT_INT(i, out);
18421842
if (i > 0) {
18431843
sdlExtraAttributePtr tmp;
1844-
zend_string *key;
1844+
const zend_string *key;
18451845

18461846
ZEND_HASH_MAP_FOREACH_STR_KEY_PTR(attr->extraAttributes, key, tmp) {
18471847
sdl_serialize_key(key, out);
@@ -1941,7 +1941,7 @@ static void sdl_serialize_type(sdlTypePtr type, HashTable *tmp_encoders, HashTab
19411941
WSDL_CACHE_PUT_INT(i, out);
19421942
if (i > 0) {
19431943
sdlRestrictionCharPtr tmp;
1944-
zend_string *key;
1944+
const zend_string *key;
19451945

19461946
ZEND_HASH_MAP_FOREACH_STR_KEY_PTR(type->restrictions->enumeration, key, tmp) {
19471947
sdl_serialize_resriction_char(tmp, out);
@@ -1959,7 +1959,7 @@ static void sdl_serialize_type(sdlTypePtr type, HashTable *tmp_encoders, HashTab
19591959
WSDL_CACHE_PUT_INT(i, out);
19601960
if (i > 0) {
19611961
sdlTypePtr tmp;
1962-
zend_string *key;
1962+
const zend_string *key;
19631963
zval zv;
19641964

19651965
tmp_elements = emalloc(sizeof(HashTable));
@@ -1982,7 +1982,7 @@ static void sdl_serialize_type(sdlTypePtr type, HashTable *tmp_encoders, HashTab
19821982
WSDL_CACHE_PUT_INT(i, out);
19831983
if (i > 0) {
19841984
sdlAttributePtr tmp;
1985-
zend_string *key;
1985+
const zend_string *key;
19861986

19871987
ZEND_HASH_FOREACH_STR_KEY_PTR(type->attributes, key, tmp) {
19881988
sdl_serialize_key(key, out);
@@ -2021,7 +2021,7 @@ static void sdl_serialize_parameters(HashTable *ht, HashTable *tmp_encoders, Has
20212021
WSDL_CACHE_PUT_INT(i, out);
20222022
if (i > 0) {
20232023
sdlParamPtr tmp;
2024-
zend_string *key;
2024+
const zend_string *key;
20252025

20262026
ZEND_HASH_FOREACH_STR_KEY_PTR(ht, key, tmp) {
20272027
sdl_serialize_key(key, out);
@@ -2050,7 +2050,7 @@ static void sdl_serialize_soap_body(sdlSoapBindingFunctionBodyPtr body, HashTabl
20502050
WSDL_CACHE_PUT_INT(i, out);
20512051
if (i > 0) {
20522052
sdlSoapBindingFunctionHeaderPtr tmp;
2053-
zend_string *key;
2053+
const zend_string *key;
20542054

20552055
ZEND_HASH_MAP_FOREACH_STR_KEY_PTR(body->headers, key, tmp) {
20562056
sdl_serialize_key(key, out);
@@ -2070,10 +2070,10 @@ static void sdl_serialize_soap_body(sdlSoapBindingFunctionBodyPtr body, HashTabl
20702070
WSDL_CACHE_PUT_INT(j, out);
20712071
if (j > 0) {
20722072
sdlSoapBindingFunctionHeaderPtr tmp2;
2073-
zend_string *key;
2073+
const zend_string *key_inner;
20742074

2075-
ZEND_HASH_MAP_FOREACH_STR_KEY_PTR(body->headers, key, tmp2) {
2076-
sdl_serialize_key(key, out);
2075+
ZEND_HASH_MAP_FOREACH_STR_KEY_PTR(body->headers, key_inner, tmp2) {
2076+
sdl_serialize_key(key_inner, out);
20772077
WSDL_CACHE_PUT_1(tmp2->use, out);
20782078
if (tmp2->use == SOAP_ENCODED) {
20792079
WSDL_CACHE_PUT_1(tmp2->encodingStyle, out);
@@ -2202,7 +2202,7 @@ static void add_sdl_to_cache(const char *fn, const char *uri, time_t t, sdlPtr s
22022202

22032203
if (sdl->groups) {
22042204
sdlTypePtr tmp;
2205-
zend_string *key;
2205+
const zend_string *key;
22062206

22072207
ZEND_HASH_MAP_FOREACH_STR_KEY_PTR(sdl->groups, key, tmp) {
22082208
sdl_serialize_key(key, out);
@@ -2212,7 +2212,7 @@ static void add_sdl_to_cache(const char *fn, const char *uri, time_t t, sdlPtr s
22122212

22132213
if (sdl->types) {
22142214
sdlTypePtr tmp;
2215-
zend_string *key;
2215+
const zend_string *key;
22162216

22172217
ZEND_HASH_FOREACH_STR_KEY_PTR(sdl->types, key, tmp) {
22182218
sdl_serialize_key(key, out);
@@ -2222,7 +2222,7 @@ static void add_sdl_to_cache(const char *fn, const char *uri, time_t t, sdlPtr s
22222222

22232223
if (sdl->elements) {
22242224
sdlTypePtr tmp;
2225-
zend_string *key;
2225+
const zend_string *key;
22262226

22272227
ZEND_HASH_MAP_FOREACH_STR_KEY_PTR(sdl->elements, key, tmp) {
22282228
sdl_serialize_key(key, out);
@@ -2232,7 +2232,7 @@ static void add_sdl_to_cache(const char *fn, const char *uri, time_t t, sdlPtr s
22322232

22332233
if (sdl->encoders) {
22342234
encodePtr tmp;
2235-
zend_string *key;
2235+
const zend_string *key;
22362236

22372237
ZEND_HASH_FOREACH_STR_KEY_PTR(sdl->encoders, key, tmp) {
22382238
sdl_serialize_key(key, out);
@@ -2251,7 +2251,7 @@ static void add_sdl_to_cache(const char *fn, const char *uri, time_t t, sdlPtr s
22512251
sdlBindingPtr tmp;
22522252
int binding_num = 1;
22532253
zval zv;
2254-
zend_string *key;
2254+
const zend_string *key;
22552255

22562256
ZEND_HASH_MAP_FOREACH_STR_KEY_PTR(sdl->bindings, key, tmp) {
22572257
sdl_serialize_key(key, out);
@@ -2279,7 +2279,7 @@ static void add_sdl_to_cache(const char *fn, const char *uri, time_t t, sdlPtr s
22792279
sdlFunctionPtr tmp;
22802280
zval *binding_num, zv;
22812281
int function_num = 1;
2282-
zend_string *key;
2282+
const zend_string *key;
22832283

22842284
ZEND_HASH_MAP_FOREACH_STR_KEY_PTR(&sdl->functions, key, tmp) {
22852285
sdl_serialize_key(key, out);
@@ -2309,12 +2309,12 @@ static void add_sdl_to_cache(const char *fn, const char *uri, time_t t, sdlPtr s
23092309

23102310
if (tmp->faults) {
23112311
sdlFaultPtr fault;
2312-
zend_string *key;
2312+
const zend_string *key_inner;
23132313

23142314
WSDL_CACHE_PUT_INT(zend_hash_num_elements(tmp->faults), out);
23152315

2316-
ZEND_HASH_MAP_FOREACH_STR_KEY_PTR(tmp->faults, key, fault) {
2317-
sdl_serialize_key(key, out);
2316+
ZEND_HASH_MAP_FOREACH_STR_KEY_PTR(tmp->faults, key_inner, fault) {
2317+
sdl_serialize_key(key_inner, out);
23182318
sdl_serialize_string(fault->name, out);
23192319
sdl_serialize_parameters(fault->details, &tmp_encoders, &tmp_types, out);
23202320
if (tmp->binding->bindingType == BINDING_SOAP && fault->bindingAttributes != NULL) {
@@ -2348,7 +2348,7 @@ static void add_sdl_to_cache(const char *fn, const char *uri, time_t t, sdlPtr s
23482348
if (i > 0) {
23492349
sdlFunctionPtr tmp;
23502350
zval *function_num;
2351-
zend_string *key;
2351+
const zend_string *key;
23522352

23532353
ZEND_HASH_MAP_FOREACH_STR_KEY_PTR(sdl->requests, key, tmp) {
23542354
function_num = zend_hash_str_find(&tmp_functions, (char*)&tmp, sizeof(tmp));

0 commit comments

Comments
 (0)