Skip to content

Commit 0e91b4f

Browse files
GirgiasGirgias
committed
ext/soap: convert int type to size_t where appropriate
1 parent 902c8ce commit 0e91b4f

File tree

1 file changed

+34
-31
lines changed

1 file changed

+34
-31
lines changed

‎ext/soap/php_sdl.c

Lines changed: 34 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,9 @@ static sdlTypePtr get_element(sdlPtr sdl, xmlNodePtr node, const xmlChar *type)
7777
parse_namespace(type, &cptype, &ns);
7878
nsptr = xmlSearchNs(node->doc, node, BAD_CAST(ns));
7979
if (nsptr != NULL) {
80-
int ns_len = xmlStrlen(nsptr->href);
81-
int type_len = strlen(cptype);
82-
int len = ns_len + type_len + 1;
80+
size_t ns_len = xmlStrlen(nsptr->href);
81+
size_t type_len = strlen(cptype);
82+
size_t len = ns_len + type_len + 1;
8383
char *nscat = emalloc(len + 1);
8484

8585
memcpy(nscat, nsptr->href, ns_len);
@@ -109,9 +109,9 @@ encodePtr get_encoder(sdlPtr sdl, const char *ns, const char *type)
109109
{
110110
encodePtr enc = NULL;
111111
char *nscat;
112-
int ns_len = ns ? strlen(ns) : 0;
113-
int type_len = strlen(type);
114-
int len = ns_len + type_len + 1;
112+
size_t ns_len = ns ? strlen(ns) : 0;
113+
size_t type_len = strlen(type);
114+
size_t len = ns_len + type_len + 1;
115115

116116
nscat = emalloc(len + 1);
117117
if (ns) {
@@ -129,8 +129,8 @@ encodePtr get_encoder(sdlPtr sdl, const char *ns, const char *type)
129129
(ns_len == sizeof(SOAP_1_2_ENC_NAMESPACE)-1 &&
130130
memcmp(ns, SOAP_1_2_ENC_NAMESPACE, sizeof(SOAP_1_2_ENC_NAMESPACE)-1) == 0))) {
131131
char *enc_nscat;
132-
int enc_ns_len;
133-
int enc_len;
132+
size_t enc_ns_len;
133+
size_t enc_len;
134134

135135
enc_ns_len = sizeof(XSD_NAMESPACE)-1;
136136
enc_len = enc_ns_len + type_len + 1;
@@ -702,7 +702,7 @@ static HashTable* wsdl_message(sdlCtx *ctx, xmlChar* message_name)
702702
static sdlPtr load_wsdl(zval *this_ptr, char *struri)
703703
{
704704
sdlCtx ctx;
705-
int i,n;
705+
size_t i,n;
706706

707707
memset(&ctx,0,sizeof(ctx));
708708
ctx.sdl = emalloc(sizeof(sdl));
@@ -999,7 +999,7 @@ static sdlPtr load_wsdl(zval *this_ptr, char *struri)
999999
} else {
10001000
*/
10011001
{
1002-
int len = strlen(function->functionName);
1002+
size_t len = strlen(function->functionName);
10031003
function->responseName = emalloc(len + sizeof("Response"));
10041004
memcpy(function->responseName, function->functionName, len);
10051005
memcpy(function->responseName+len, "Response", sizeof("Response"));
@@ -1103,7 +1103,7 @@ static sdlPtr load_wsdl(zval *this_ptr, char *struri)
11031103

11041104
{
11051105
char *tmp = estrdup(function->functionName);
1106-
int len = strlen(tmp);
1106+
size_t len = strlen(tmp);
11071107

11081108
zend_str_tolower(tmp, len);
11091109
if (zend_hash_str_add_ptr(&ctx.sdl->functions, tmp, len, function) == NULL) {
@@ -1181,7 +1181,7 @@ static sdlPtr load_wsdl(zval *this_ptr, char *struri)
11811181
static char* sdl_deserialize_string(char **in)
11821182
{
11831183
char *s;
1184-
int len;
1184+
size_t len;
11851185

11861186
WSDL_CACHE_GET_INT(len, in);
11871187
if (len == WSDL_NO_STRING_MARKER) {
@@ -1196,7 +1196,7 @@ static char* sdl_deserialize_string(char **in)
11961196

11971197
static void sdl_deserialize_key(HashTable* ht, void* data, char **in)
11981198
{
1199-
int len;
1199+
size_t len;
12001200

12011201
WSDL_CACHE_GET_INT(len, in);
12021202
if (len == WSDL_NO_STRING_MARKER) {
@@ -1209,7 +1209,7 @@ static void sdl_deserialize_key(HashTable* ht, void* data, char **in)
12091209

12101210
static void sdl_deserialize_attribute(sdlAttributePtr attr, encodePtr *encoders, char **in)
12111211
{
1212-
int i;
1212+
size_t i;
12131213

12141214
attr->name = sdl_deserialize_string(in);
12151215
attr->namens = sdl_deserialize_string(in);
@@ -1264,7 +1264,7 @@ static sdlRestrictionCharPtr sdl_deserialize_resriction_char(char **in)
12641264

12651265
static sdlContentModelPtr sdl_deserialize_model(sdlTypePtr *types, sdlTypePtr *elements, char **in)
12661266
{
1267-
int i;
1267+
size_t i;
12681268
sdlContentModelPtr model = emalloc(sizeof(sdlContentModel));
12691269

12701270
WSDL_CACHE_GET_1(model->kind, sdlContentKind, in);
@@ -1302,7 +1302,7 @@ static sdlContentModelPtr sdl_deserialize_model(sdlTypePtr *types, sdlTypePtr *e
13021302

13031303
static void sdl_deserialize_type(sdlTypePtr type, sdlTypePtr *types, encodePtr *encoders, char **in)
13041304
{
1305-
int i;
1305+
size_t i;
13061306
sdlTypePtr *elements = NULL;
13071307

13081308
WSDL_CACHE_GET_1(type->kind, sdlTypeKind, in);
@@ -1390,7 +1390,7 @@ static void sdl_deserialize_type(sdlTypePtr type, sdlTypePtr *types, encodePtr *
13901390

13911391
static void sdl_deserialize_encoder(encodePtr enc, sdlTypePtr *types, char **in)
13921392
{
1393-
int i;
1393+
size_t i;
13941394

13951395
WSDL_CACHE_GET_INT(enc->details.type, in);
13961396
enc->details.type_str = sdl_deserialize_string(in);
@@ -1404,16 +1404,16 @@ static void sdl_deserialize_encoder(encodePtr enc, sdlTypePtr *types, char **in)
14041404
enc->to_zval = sdl_guess_convert_zval;
14051405

14061406
if (enc->details.sdl_type == NULL) {
1407-
int ns_len = strlen(enc->details.ns);
1408-
int type_len = strlen(enc->details.type_str);
1407+
size_t ns_len = strlen(enc->details.ns);
1408+
size_t type_len = strlen(enc->details.type_str);
14091409

14101410
if (((ns_len == sizeof(SOAP_1_1_ENC_NAMESPACE)-1 &&
14111411
memcmp(enc->details.ns, SOAP_1_1_ENC_NAMESPACE, sizeof(SOAP_1_1_ENC_NAMESPACE)-1) == 0) ||
14121412
(ns_len == sizeof(SOAP_1_2_ENC_NAMESPACE)-1 &&
14131413
memcmp(enc->details.ns, SOAP_1_2_ENC_NAMESPACE, sizeof(SOAP_1_2_ENC_NAMESPACE)-1) == 0))) {
14141414
char *enc_nscat;
1415-
int enc_ns_len;
1416-
int enc_len;
1415+
size_t enc_ns_len;
1416+
size_t enc_len;
14171417
encodePtr real_enc;
14181418

14191419
enc_ns_len = sizeof(XSD_NAMESPACE)-1;
@@ -1436,7 +1436,7 @@ static void sdl_deserialize_encoder(encodePtr enc, sdlTypePtr *types, char **in)
14361436

14371437
static void sdl_deserialize_soap_body(sdlSoapBindingFunctionBodyPtr body, encodePtr *encoders, sdlTypePtr *types, char **in)
14381438
{
1439-
int i, j, n;
1439+
size_t i, n;
14401440

14411441
WSDL_CACHE_GET_1(body->use, sdlEncodingUse, in);
14421442
if (body->use == SOAP_ENCODED) {
@@ -1466,6 +1466,8 @@ static void sdl_deserialize_soap_body(sdlSoapBindingFunctionBodyPtr body, encode
14661466
WSDL_CACHE_GET_INT(n, in);
14671467
tmp->element = types[n];
14681468
--i;
1469+
1470+
size_t j;
14691471
WSDL_CACHE_GET_INT(j, in);
14701472
if (j > 0) {
14711473
tmp->headerfaults = emalloc(sizeof(HashTable));
@@ -1482,6 +1484,7 @@ static void sdl_deserialize_soap_body(sdlSoapBindingFunctionBodyPtr body, encode
14821484
}
14831485
tmp2->name = sdl_deserialize_string(in);
14841486
tmp2->ns = sdl_deserialize_string(in);
1487+
14851488
WSDL_CACHE_GET_INT(n, in);
14861489
tmp2->encode = encoders[n];
14871490
WSDL_CACHE_GET_INT(n, in);
@@ -1495,7 +1498,7 @@ static void sdl_deserialize_soap_body(sdlSoapBindingFunctionBodyPtr body, encode
14951498

14961499
static HashTable* sdl_deserialize_parameters(encodePtr *encoders, sdlTypePtr *types, char **in)
14971500
{
1498-
int i, n;
1501+
size_t i, n;
14991502
HashTable *ht;
15001503

15011504
WSDL_CACHE_GET_INT(i, in);
@@ -1771,7 +1774,7 @@ static sdlPtr get_sdl_from_cache(const char *fn, const char *uri, size_t uri_len
17711774
static void sdl_serialize_string(const char *str, smart_str *out)
17721775
{
17731776
if (str) {
1774-
int i = strlen(str);
1777+
size_t i = strlen(str);
17751778
WSDL_CACHE_PUT_INT(i, out);
17761779
if (i > 0) {
17771780
WSDL_CACHE_PUT_N(str, i, out);
@@ -1820,7 +1823,7 @@ static void sdl_serialize_type_ref(sdlTypePtr type, HashTable *tmp_types, smart_
18201823

18211824
static void sdl_serialize_attribute(sdlAttributePtr attr, HashTable *tmp_encoders, smart_str *out)
18221825
{
1823-
int i;
1826+
size_t i;
18241827

18251828
sdl_serialize_string(attr->name, out);
18261829
sdl_serialize_string(attr->namens, out);
@@ -1861,7 +1864,7 @@ static void sdl_serialize_model(sdlContentModelPtr model, HashTable *tmp_types,
18611864
case XSD_CONTENT_ALL:
18621865
case XSD_CONTENT_CHOICE: {
18631866
sdlContentModelPtr tmp;
1864-
int i = zend_hash_num_elements(model->u.content);
1867+
size_t i = zend_hash_num_elements(model->u.content);
18651868

18661869
WSDL_CACHE_PUT_INT(i, out);
18671870
ZEND_HASH_FOREACH_PTR(model->u.content, tmp) {
@@ -1904,7 +1907,7 @@ static void sdl_serialize_resriction_char(sdlRestrictionCharPtr x, smart_str *ou
19041907

19051908
static void sdl_serialize_type(sdlTypePtr type, HashTable *tmp_encoders, HashTable *tmp_types, smart_str *out)
19061909
{
1907-
int i;
1910+
size_t i;
19081911
HashTable *tmp_elements = NULL;
19091912

19101913
WSDL_CACHE_PUT_1(type->kind, out);
@@ -2008,7 +2011,7 @@ static void sdl_serialize_encoder(encodePtr enc, HashTable *tmp_types, smart_str
20082011

20092012
static void sdl_serialize_parameters(HashTable *ht, HashTable *tmp_encoders, HashTable *tmp_types, smart_str *out)
20102013
{
2011-
int i;
2014+
size_t i;
20122015

20132016
if (ht) {
20142017
i = zend_hash_num_elements(ht);
@@ -2032,7 +2035,7 @@ static void sdl_serialize_parameters(HashTable *ht, HashTable *tmp_encoders, Has
20322035

20332036
static void sdl_serialize_soap_body(sdlSoapBindingFunctionBodyPtr body, HashTable *tmp_encoders, HashTable *tmp_types, smart_str *out)
20342037
{
2035-
int i, j;
2038+
size_t i, j;
20362039

20372040
WSDL_CACHE_PUT_1(body->use, out);
20382041
if (body->use == SOAP_ENCODED) {
@@ -3195,10 +3198,10 @@ sdlPtr get_sdl(zval *this_ptr, char *uri, zend_long cache_wsdl)
31953198
char md5str[33];
31963199
PHP_MD5_CTX md5_context;
31973200
unsigned char digest[16];
3198-
int len = strlen(SOAP_GLOBAL(cache_dir));
3201+
size_t len = strlen(SOAP_GLOBAL(cache_dir));
31993202
time_t cached;
32003203
char *user = php_get_current_user();
3201-
int user_len = user ? strlen(user) + 1 : 0;
3204+
size_t user_len = user ? strlen(user) + 1 : 0;
32023205

32033206
md5str[0] = '\0';
32043207
PHP_MD5Init(&md5_context);

0 commit comments

Comments
 (0)