Skip to content

Commit e140b35

Browse files
zsuraskizsuraski
committed
API update
1 parent 4757104 commit e140b35

File tree

9 files changed

+26
-21
lines changed

9 files changed

+26
-21
lines changed

‎ext/openssl/openssl.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1284,7 +1284,8 @@ PHP_FUNCTION(openssl_pkcs7_encrypt)
12841284
X509 * cert;
12851285
int argc;
12861286
EVP_CIPHER *cipher = NULL;
1287-
ulong strindexlen, intindex;
1287+
uint strindexlen;
1288+
ulong intindex;
12881289
char * strindex;
12891290

12901291
argc = ZEND_NUM_ARGS();
@@ -1419,7 +1420,8 @@ PHP_FUNCTION(openssl_pkcs7_sign)
14191420
BIO * infile = NULL, * outfile = NULL;
14201421
STACK_OF(X509) *others = NULL;
14211422
long certresource = -1, keyresource = -1;
1422-
ulong strindexlen, intindex;
1423+
ulong intindex;
1424+
uint strindexlen;
14231425
HashPosition hpos;
14241426
char * strindex;
14251427

‎ext/session/php_session.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ int php_session_register_serializer(const char *name,
174174

175175
#define PS_ENCODE_VARS \
176176
char *key; \
177-
ulong key_length; \
177+
uint key_length; \
178178
ulong num_key; \
179179
zval **struc;
180180

‎ext/session/session.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -529,7 +529,7 @@ static void php_session_save_current_state(TSRMLS_D)
529529
int vallen;
530530
int ret = FAILURE;
531531
char *variable;
532-
ulong variable_len;
532+
uint variable_len;
533533
ulong num_key;
534534
HashPosition pos;
535535

‎ext/standard/array.c

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -948,7 +948,7 @@ static int php_array_walk(HashTable *target_hash, zval **userdata TSRMLS_DC)
948948
*retval_ptr, /* Return value - unused */
949949
*key; /* Entry key */
950950
char *string_key;
951-
ulong string_key_len;
951+
uint string_key_len;
952952
ulong num_key;
953953
HashPosition pos;
954954

@@ -1144,7 +1144,8 @@ PHP_FUNCTION(extract)
11441144
zval **var_array, **z_extract_type, **prefix;
11451145
zval **entry, *data;
11461146
char *var_name, *final_name;
1147-
ulong num_key, var_name_len;
1147+
ulong num_key;
1148+
uint var_name_len;
11481149
int var_exists, extract_type, key_type, count = 0;
11491150
HashPosition pos;
11501151

@@ -1735,7 +1736,7 @@ PHP_FUNCTION(array_slice)
17351736
argc; /* Number of function arguments */
17361737

17371738
char *string_key;
1738-
ulong string_key_len;
1739+
uint string_key_len;
17391740
ulong num_key;
17401741
HashPosition hpos;
17411742

@@ -1821,7 +1822,7 @@ PHPAPI void php_array_merge(HashTable *dest, HashTable *src, int recursive)
18211822
zval **src_entry,
18221823
**dest_entry;
18231824
char *string_key;
1824-
ulong string_key_len;
1825+
uint string_key_len;
18251826
ulong num_key;
18261827
HashPosition pos;
18271828

@@ -1913,7 +1914,7 @@ PHP_FUNCTION(array_keys)
19131914
*new_val; /* New value */
19141915
int add_key; /* Flag to indicate whether a key should be added */
19151916
char *string_key; /* String key */
1916-
ulong string_key_len;
1917+
uint string_key_len;
19171918
ulong num_key; /* Numeric key */
19181919
HashPosition pos;
19191920

@@ -2074,7 +2075,7 @@ PHP_FUNCTION(array_reverse)
20742075
**z_preserve_keys, /* Flag: whether to preserve keys */
20752076
**entry; /* An entry in the input array */
20762077
char *string_key;
2077-
ulong string_key_len;
2078+
uint string_key_len;
20782079
ulong num_key;
20792080
zend_bool preserve_keys = 0;
20802081
HashPosition pos;
@@ -2195,7 +2196,7 @@ PHP_FUNCTION(array_flip)
21952196
zval **array, **entry, *data;
21962197
HashTable *target_hash;
21972198
char *string_key;
2198-
ulong str_key_len;
2199+
uint str_key_len;
21992200
ulong num_key;
22002201
HashPosition pos;
22012202

@@ -2721,7 +2722,7 @@ PHP_FUNCTION(array_rand)
27212722
long randval;
27222723
int num_req_val, num_avail, key_type;
27232724
char *string_key;
2724-
ulong string_key_len;
2725+
uint string_key_len;
27252726
ulong num_key;
27262727
HashPosition pos;
27272728

@@ -2926,7 +2927,7 @@ PHP_FUNCTION(array_filter)
29262927
zval *retval = NULL;
29272928
char *callback_name;
29282929
char *string_key;
2929-
ulong string_key_len;
2930+
uint string_key_len;
29302931
ulong num_key;
29312932
HashPosition pos;
29322933

‎ext/standard/php_var.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,9 @@ if (var_hash) { \
5353
while (zend_hash_get_current_data_ex(var_hash, (void **) &zval_ref, &pos) == SUCCESS) { \
5454
if (*zval_ref == ozval) { \
5555
char *string_key; \
56-
ulong str_key_len; \
56+
uint str_key_len; \
5757
ulong num_key; \
58+
\
5859
zend_hash_get_current_key_ex(var_hash, &string_key, &str_key_len, &num_key, 1, &pos); \
5960
/* this is our hash and it _will_ be number indexed! */ \
6061
zend_hash_index_update(var_hash, num_key, &nzval, sizeof(zval *), NULL); \

‎ext/standard/string.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2713,7 +2713,8 @@ PHP_FUNCTION(str_replace)
27132713
zval **subject, **search, **replace, **subject_entry, **pboyer;
27142714
zval *result;
27152715
char *string_key;
2716-
ulong string_key_len, num_key;
2716+
uint string_key_len;
2717+
ulong num_key;
27172718
int boyer = 0;
27182719

27192720
if(ZEND_NUM_ARGS() < 3 ||

‎ext/standard/var.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ static void php_var_serialize_intern(smart_str *buf, zval **struc, HashTable *va
320320
char *key;
321321
zval **data;
322322
ulong index;
323-
ulong key_len;
323+
uint key_len;
324324
HashPosition pos;
325325

326326
zend_hash_internal_pointer_reset_ex(myht, &pos);

‎ext/wddx/wddx.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ PS_SERIALIZER_DECODE_FUNC(wddx)
246246
zval *retval;
247247
zval **ent;
248248
char *key;
249-
ulong key_length;
249+
uint key_length;
250250
char tmp[128];
251251
ulong idx;
252252
int hash_type;
@@ -477,7 +477,7 @@ static void php_wddx_serialize_object(wddx_packet *packet, zval *obj)
477477
php_wddx_add_chunk_static(packet, WDDX_STRUCT_E);
478478
}
479479
} else {
480-
ulong key_len;
480+
uint key_len;
481481

482482
PHP_CLASS_ATTRIBUTES;
483483

@@ -524,7 +524,7 @@ static void php_wddx_serialize_array(wddx_packet *packet, zval *arr)
524524
{
525525
zval **ent;
526526
char *key;
527-
ulong key_len;
527+
uint key_len;
528528
int is_struct = 0, ent_type;
529529
ulong idx;
530530
HashTable *target_hash;

‎sapi/apache2filter/apache_config.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ void *merge_php_config(apr_pool_t *p, void *base_conf, void *new_conf)
8888
php_dir_entry *pe;
8989
php_dir_entry *data;
9090
char *str;
91-
ulong str_len;
91+
uint str_len;
9292
ulong num_index;
9393

9494
phpapdebug((stderr, "Merge dir (%p) (%p)\n", base_conf, new_conf));
@@ -110,7 +110,7 @@ void apply_config(void *dummy)
110110
{
111111
php_conf_rec *d = dummy;
112112
char *str;
113-
ulong str_len;
113+
uint str_len;
114114
php_dir_entry *data;
115115

116116
for (zend_hash_internal_pointer_reset(&d->config);

0 commit comments

Comments
 (0)