Skip to content

Commit a980149

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 5a2311b commit a980149

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
@@ -1786,7 +1786,7 @@ static void sdl_serialize_string(const char *str, smart_str *out)
17861786
}
17871787

17881788
// TODO: refactor it
1789-
static void sdl_serialize_key(zend_string *key, smart_str *out)
1789+
static void sdl_serialize_key(const zend_string *key, smart_str *out)
17901790
{
17911791
if (key) {
17921792
WSDL_CACHE_PUT_INT(ZSTR_LEN(key), out);
@@ -1842,7 +1842,7 @@ static void sdl_serialize_attribute(sdlAttributePtr attr, HashTable *tmp_encoder
18421842
WSDL_CACHE_PUT_INT(i, out);
18431843
if (i > 0) {
18441844
sdlExtraAttributePtr tmp;
1845-
zend_string *key;
1845+
const zend_string *key;
18461846

18471847
ZEND_HASH_MAP_FOREACH_STR_KEY_PTR(attr->extraAttributes, key, tmp) {
18481848
sdl_serialize_key(key, out);
@@ -1942,7 +1942,7 @@ static void sdl_serialize_type(sdlTypePtr type, HashTable *tmp_encoders, HashTab
19421942
WSDL_CACHE_PUT_INT(i, out);
19431943
if (i > 0) {
19441944
sdlRestrictionCharPtr tmp;
1945-
zend_string *key;
1945+
const zend_string *key;
19461946

19471947
ZEND_HASH_MAP_FOREACH_STR_KEY_PTR(type->restrictions->enumeration, key, tmp) {
19481948
sdl_serialize_resriction_char(tmp, out);
@@ -1960,7 +1960,7 @@ static void sdl_serialize_type(sdlTypePtr type, HashTable *tmp_encoders, HashTab
19601960
WSDL_CACHE_PUT_INT(i, out);
19611961
if (i > 0) {
19621962
sdlTypePtr tmp;
1963-
zend_string *key;
1963+
const zend_string *key;
19641964
zval zv;
19651965

19661966
tmp_elements = emalloc(sizeof(HashTable));
@@ -1983,7 +1983,7 @@ static void sdl_serialize_type(sdlTypePtr type, HashTable *tmp_encoders, HashTab
19831983
WSDL_CACHE_PUT_INT(i, out);
19841984
if (i > 0) {
19851985
sdlAttributePtr tmp;
1986-
zend_string *key;
1986+
const zend_string *key;
19871987

19881988
ZEND_HASH_FOREACH_STR_KEY_PTR(type->attributes, key, tmp) {
19891989
sdl_serialize_key(key, out);
@@ -2022,7 +2022,7 @@ static void sdl_serialize_parameters(HashTable *ht, HashTable *tmp_encoders, Has
20222022
WSDL_CACHE_PUT_INT(i, out);
20232023
if (i > 0) {
20242024
sdlParamPtr tmp;
2025-
zend_string *key;
2025+
const zend_string *key;
20262026

20272027
ZEND_HASH_FOREACH_STR_KEY_PTR(ht, key, tmp) {
20282028
sdl_serialize_key(key, out);
@@ -2051,7 +2051,7 @@ static void sdl_serialize_soap_body(sdlSoapBindingFunctionBodyPtr body, HashTabl
20512051
WSDL_CACHE_PUT_INT(i, out);
20522052
if (i > 0) {
20532053
sdlSoapBindingFunctionHeaderPtr tmp;
2054-
zend_string *key;
2054+
const zend_string *key;
20552055

20562056
ZEND_HASH_MAP_FOREACH_STR_KEY_PTR(body->headers, key, tmp) {
20572057
sdl_serialize_key(key, out);
@@ -2071,10 +2071,10 @@ static void sdl_serialize_soap_body(sdlSoapBindingFunctionBodyPtr body, HashTabl
20712071
WSDL_CACHE_PUT_INT(j, out);
20722072
if (j > 0) {
20732073
sdlSoapBindingFunctionHeaderPtr tmp2;
2074-
zend_string *key;
2074+
const zend_string *key_inner;
20752075

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

22042204
if (sdl->groups) {
22052205
sdlTypePtr tmp;
2206-
zend_string *key;
2206+
const zend_string *key;
22072207

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

22142214
if (sdl->types) {
22152215
sdlTypePtr tmp;
2216-
zend_string *key;
2216+
const zend_string *key;
22172217

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

22242224
if (sdl->elements) {
22252225
sdlTypePtr tmp;
2226-
zend_string *key;
2226+
const zend_string *key;
22272227

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

22342234
if (sdl->encoders) {
22352235
encodePtr tmp;
2236-
zend_string *key;
2236+
const zend_string *key;
22372237

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

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

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

23112311
if (tmp->faults) {
23122312
sdlFaultPtr fault;
2313-
zend_string *key;
2313+
const zend_string *key_inner;
23142314

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

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

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

0 commit comments

Comments
 (0)