Skip to content

Commit bf18c56

Browse files
committed
trivial fixes to spl
1 parent 890345e commit bf18c56

File tree

6 files changed

+7
-7
lines changed

6 files changed

+7
-7
lines changed

ext/spl/php_spl.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -627,7 +627,7 @@ PHP_FUNCTION(spl_autoload_register)
627627
PHP_FUNCTION(spl_autoload_unregister)
628628
{
629629
char *func_name, *error = NULL;
630-
int func_name_len;
630+
zend_str_size_int func_name_len;
631631
char *lc_name = NULL;
632632
zval *zcallable;
633633
int success = FAILURE;

ext/spl/spl_directory.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ static zend_object_value spl_filesystem_object_new_check(zend_class_entry *class
183183
/* }}} */
184184

185185

186-
PHPAPI char* spl_filesystem_object_get_path(spl_filesystem_object *intern, int *len TSRMLS_DC) /* {{{ */
186+
PHPAPI char* spl_filesystem_object_get_path(spl_filesystem_object *intern, zend_str_size_int *len TSRMLS_DC) /* {{{ */
187187
{
188188
#ifdef HAVE_GLOB
189189
if (intern->type == SPL_FS_DIR) {
@@ -589,7 +589,7 @@ static HashTable* spl_filesystem_object_get_debug_info(zval *obj, int *is_temp T
589589
HashTable *rv;
590590
zval *tmp, zrv;
591591
char *pnstr, *path;
592-
int pnlen, path_len;
592+
zend_str_size_int pnlen, path_len;
593593
char stmp[2];
594594

595595
*is_temp = 1;

ext/spl/spl_dllist.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -511,7 +511,7 @@ static HashTable* spl_dllist_object_get_debug_info(zval *obj, int *is_temp TSRML
511511
spl_ptr_llist_element *current = intern->llist->head, *next;
512512
zval *tmp, zrv, *dllist_array;
513513
char *pnstr;
514-
int pnlen;
514+
zend_str_size_int pnlen;
515515
int i = 0;
516516

517517
*is_temp = 0;

ext/spl/spl_functions.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ int spl_add_classes(zend_class_entry *pce, zval *list, int sub, int allow, int c
133133
}
134134
/* }}} */
135135

136-
char * spl_gen_private_prop_name(zend_class_entry *ce, char *prop_name, int prop_len, int *name_len TSRMLS_DC) /* {{{ */
136+
char * spl_gen_private_prop_name(zend_class_entry *ce, char *prop_name, zend_str_size_int prop_len, zend_str_size_int *name_len TSRMLS_DC) /* {{{ */
137137
{
138138
char *rv;
139139

ext/spl/spl_heap.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -523,7 +523,7 @@ static HashTable* spl_heap_object_get_debug_info_helper(zend_class_entry *ce, zv
523523
spl_heap_object *intern = (spl_heap_object*)zend_object_store_get_object(obj TSRMLS_CC);
524524
zval *tmp, zrv, *heap_array;
525525
char *pnstr;
526-
int pnlen;
526+
zend_str_size_int pnlen;
527527
int i;
528528

529529
*is_temp = 0;

ext/spl/spl_observer.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ static HashTable* spl_object_storage_debug_info(zval *obj, int *is_temp TSRMLS_D
318318
HashPosition pos;
319319
zval *tmp, *storage;
320320
char md5str[33];
321-
int name_len;
321+
zend_str_size_int name_len;
322322
char *zname;
323323

324324
*is_temp = 0;

0 commit comments

Comments
 (0)