Browse Source

trivial fixes to spl

pull/535/head
Anatol Belski 13 years ago
parent
commit
2f39ef6596
  1. 2
      ext/spl/php_spl.c
  2. 4
      ext/spl/spl_directory.c
  3. 2
      ext/spl/spl_dllist.c
  4. 2
      ext/spl/spl_functions.c
  5. 2
      ext/spl/spl_heap.c
  6. 2
      ext/spl/spl_observer.c

2
ext/spl/php_spl.c

@ -627,7 +627,7 @@ skip:
PHP_FUNCTION(spl_autoload_unregister)
{
char *func_name, *error = NULL;
int func_name_len;
zend_str_size_int func_name_len;
char *lc_name = NULL;
zval *zcallable;
int success = FAILURE;

4
ext/spl/spl_directory.c

@ -183,7 +183,7 @@ static zend_object_value spl_filesystem_object_new_check(zend_class_entry *class
/* }}} */
PHPAPI char* spl_filesystem_object_get_path(spl_filesystem_object *intern, int *len TSRMLS_DC) /* {{{ */
PHPAPI char* spl_filesystem_object_get_path(spl_filesystem_object *intern, zend_str_size_int *len TSRMLS_DC) /* {{{ */
{
#ifdef HAVE_GLOB
if (intern->type == SPL_FS_DIR) {
@ -589,7 +589,7 @@ static HashTable* spl_filesystem_object_get_debug_info(zval *obj, int *is_temp T
HashTable *rv;
zval *tmp, zrv;
char *pnstr, *path;
int pnlen, path_len;
zend_str_size_int pnlen, path_len;
char stmp[2];
*is_temp = 1;

2
ext/spl/spl_dllist.c

@ -511,7 +511,7 @@ static HashTable* spl_dllist_object_get_debug_info(zval *obj, int *is_temp TSRML
spl_ptr_llist_element *current = intern->llist->head, *next;
zval *tmp, zrv, *dllist_array;
char *pnstr;
int pnlen;
zend_str_size_int pnlen;
int i = 0;
*is_temp = 0;

2
ext/spl/spl_functions.c

@ -133,7 +133,7 @@ int spl_add_classes(zend_class_entry *pce, zval *list, int sub, int allow, int c
}
/* }}} */
char * spl_gen_private_prop_name(zend_class_entry *ce, char *prop_name, int prop_len, int *name_len TSRMLS_DC) /* {{{ */
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) /* {{{ */
{
char *rv;

2
ext/spl/spl_heap.c

@ -523,7 +523,7 @@ static HashTable* spl_heap_object_get_debug_info_helper(zend_class_entry *ce, zv
spl_heap_object *intern = (spl_heap_object*)zend_object_store_get_object(obj TSRMLS_CC);
zval *tmp, zrv, *heap_array;
char *pnstr;
int pnlen;
zend_str_size_int pnlen;
int i;
*is_temp = 0;

2
ext/spl/spl_observer.c

@ -318,7 +318,7 @@ static HashTable* spl_object_storage_debug_info(zval *obj, int *is_temp TSRMLS_D
HashPosition pos;
zval *tmp, *storage;
char md5str[33];
int name_len;
zend_str_size_int name_len;
char *zname;
*is_temp = 0;

Loading…
Cancel
Save