Skip to content

Commit 44d4f0e

Browse files
arshidkv12arshidkv12
authored
ext/soap: Use smart_str_appends() instead of smart_str_appendl(..., strlen(...)) (GH-21426)
1 parent 5ccaccd commit 44d4f0e

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

‎ext/soap/soap.c‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4344,7 +4344,7 @@ static void function_to_string(sdlFunctionPtr function, smart_str *buf) /* {{{ *
43444344
zend_hash_internal_pointer_reset(function->responseParameters);
43454345
param = zend_hash_get_current_data_ptr(function->responseParameters);
43464346
if (param->encode && param->encode->details.type_str) {
4347-
smart_str_appendl(buf, param->encode->details.type_str, strlen(param->encode->details.type_str));
4347+
smart_str_appends(buf, param->encode->details.type_str);
43484348
smart_str_appendc(buf, ' ');
43494349
} else {
43504350
smart_str_appendl(buf, "UNKNOWN ", 8);
@@ -4357,12 +4357,12 @@ static void function_to_string(sdlFunctionPtr function, smart_str *buf) /* {{{ *
43574357
smart_str_appendl(buf, ", ", 2);
43584358
}
43594359
if (param->encode && param->encode->details.type_str) {
4360-
smart_str_appendl(buf, param->encode->details.type_str, strlen(param->encode->details.type_str));
4360+
smart_str_appends(buf, param->encode->details.type_str);
43614361
} else {
43624362
smart_str_appendl(buf, "UNKNOWN", 7);
43634363
}
43644364
smart_str_appendl(buf, " $", 2);
4365-
smart_str_appendl(buf, param->paramName, strlen(param->paramName));
4365+
smart_str_appends(buf, param->paramName);
43664366
i++;
43674367
} ZEND_HASH_FOREACH_END();
43684368
smart_str_appendl(buf, ") ", 2);
@@ -4371,7 +4371,7 @@ static void function_to_string(sdlFunctionPtr function, smart_str *buf) /* {{{ *
43714371
smart_str_appendl(buf, "void ", 5);
43724372
}
43734373

4374-
smart_str_appendl(buf, function->functionName, strlen(function->functionName));
4374+
smart_str_appends(buf, function->functionName);
43754375

43764376
smart_str_appendc(buf, '(');
43774377
if (function->requestParameters) {
@@ -4381,12 +4381,12 @@ static void function_to_string(sdlFunctionPtr function, smart_str *buf) /* {{{ *
43814381
smart_str_appendl(buf, ", ", 2);
43824382
}
43834383
if (param->encode && param->encode->details.type_str) {
4384-
smart_str_appendl(buf, param->encode->details.type_str, strlen(param->encode->details.type_str));
4384+
smart_str_appends(buf, param->encode->details.type_str);
43854385
} else {
43864386
smart_str_appendl(buf, "UNKNOWN", 7);
43874387
}
43884388
smart_str_appendl(buf, " $", 2);
4389-
smart_str_appendl(buf, param->paramName, strlen(param->paramName));
4389+
smart_str_appends(buf, param->paramName);
43904390
i++;
43914391
} ZEND_HASH_FOREACH_END();
43924392
}
@@ -4442,12 +4442,12 @@ static void type_to_string(sdlTypePtr type, smart_str *buf, int level) /* {{{ */
44424442
switch (type->kind) {
44434443
case XSD_TYPEKIND_SIMPLE:
44444444
if (type->encode) {
4445-
smart_str_appendl(buf, type->encode->details.type_str, strlen(type->encode->details.type_str));
4445+
smart_str_appends(buf, type->encode->details.type_str);
44464446
smart_str_appendc(buf, ' ');
44474447
} else {
44484448
smart_str_appendl(buf, "anyType ", sizeof("anyType ")-1);
44494449
}
4450-
smart_str_appendl(buf, type->name, strlen(type->name));
4450+
smart_str_appends(buf, type->name);
44514451

44524452
if (type->restrictions && type->restrictions->enumeration) {
44534453
zend_string *key;
@@ -4467,20 +4467,20 @@ static void type_to_string(sdlTypePtr type, smart_str *buf, int level) /* {{{ */
44674467
break;
44684468
case XSD_TYPEKIND_LIST:
44694469
smart_str_appendl(buf, "list ", 5);
4470-
smart_str_appendl(buf, type->name, strlen(type->name));
4470+
smart_str_appends(buf, type->name);
44714471
if (type->elements) {
44724472
sdlTypePtr item_type;
44734473

44744474
smart_str_appendl(buf, " {", 2);
44754475
ZEND_HASH_FOREACH_PTR(type->elements, item_type) {
4476-
smart_str_appendl(buf, item_type->name, strlen(item_type->name));
4476+
smart_str_appends(buf, item_type->name);
44774477
} ZEND_HASH_FOREACH_END();
44784478
smart_str_appendc(buf, '}');
44794479
}
44804480
break;
44814481
case XSD_TYPEKIND_UNION:
44824482
smart_str_appendl(buf, "union ", 6);
4483-
smart_str_appendl(buf, type->name, strlen(type->name));
4483+
smart_str_appends(buf, type->name);
44844484
if (type->elements) {
44854485
sdlTypePtr item_type;
44864486
int first = 0;
@@ -4491,7 +4491,7 @@ static void type_to_string(sdlTypePtr type, smart_str *buf, int level) /* {{{ */
44914491
smart_str_appendc(buf, ',');
44924492
first = 0;
44934493
}
4494-
smart_str_appendl(buf, item_type->name, strlen(item_type->name));
4494+
smart_str_appends(buf, item_type->name);
44954495
} ZEND_HASH_FOREACH_END();
44964496
smart_str_appendc(buf, '}');
44974497
}
@@ -4523,7 +4523,7 @@ static void type_to_string(sdlTypePtr type, smart_str *buf, int level) /* {{{ */
45234523
smart_str_appendl(buf, ext->val, len);
45244524
}
45254525
smart_str_appendc(buf, ' ');
4526-
smart_str_appendl(buf, type->name, strlen(type->name));
4526+
smart_str_appends(buf, type->name);
45274527
if (end != NULL) {
45284528
smart_str_appends(buf, end);
45294529
}
@@ -4546,7 +4546,7 @@ static void type_to_string(sdlTypePtr type, smart_str *buf, int level) /* {{{ */
45464546
} else {
45474547
smart_str_appendl(buf, "anyType ", 8);
45484548
}
4549-
smart_str_appendl(buf, type->name, strlen(type->name));
4549+
smart_str_appends(buf, type->name);
45504550
if (type->attributes &&
45514551
(attr = zend_hash_str_find_ptr(type->attributes, SOAP_1_2_ENC_NAMESPACE":arraySize",
45524552
sizeof(SOAP_1_2_ENC_NAMESPACE":arraySize")-1)) != NULL &&
@@ -4561,7 +4561,7 @@ static void type_to_string(sdlTypePtr type, smart_str *buf, int level) /* {{{ */
45614561
}
45624562
} else {
45634563
smart_str_appendl(buf, "struct ", 7);
4564-
smart_str_appendl(buf, type->name, strlen(type->name));
4564+
smart_str_appends(buf, type->name);
45654565
smart_str_appendc(buf, ' ');
45664566
smart_str_appendl(buf, "{\n", 2);
45674567
if ((type->kind == XSD_TYPEKIND_RESTRICTION ||
@@ -4579,7 +4579,7 @@ static void type_to_string(sdlTypePtr type, smart_str *buf, int level) /* {{{ */
45794579
smart_str_appendl(buf, ZSTR_VAL(spaces.s), ZSTR_LEN(spaces.s));
45804580
}
45814581
smart_str_appendc(buf, ' ');
4582-
smart_str_appendl(buf, type->encode->details.type_str, strlen(type->encode->details.type_str));
4582+
smart_str_appends(buf, type->encode->details.type_str);
45834583
smart_str_appendl(buf, " _;\n", 4);
45844584
}
45854585
}

0 commit comments

Comments
 (0)