com php-src: made zend list to use 64 bit indexes: Zend/zend_ list.c Zend/zend_list.h
| From: | Anatol Belski | Date: | Fri, 22 Nov 2013 07:51:13 +0000 |
| Subject: | com php-src: made zend list to use 64 bit indexes: Zend/zend_ list.c Zend/zend_list.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-74024@lists.php.net to get a copy of this message | ||
Commit: 28cb72f4806ff654822c3c443309a57bfedd4e71
Author: Anatol Belski <ab@php.net> Fri, 22 Nov 2013 08:51:13 +0100
Parents: f88c30507c2a3a3f376c284117ff505e1cf8b234
Branches: str_size_and_int64
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=28cb72f4806ff654822c3c443309a57bfedd4e71
Log:
made zend list to use 64 bit indexes
Changed paths:
M Zend/zend_list.c
M Zend/zend_list.h
Diff:
diff --git a/Zend/zend_list.c b/Zend/zend_list.c
index e60deb1..235b800 100644
--- a/Zend/zend_list.c
+++ b/Zend/zend_list.c
@@ -32,9 +32,9 @@ ZEND_API int le_index_ptr;
static HashTable list_destructors;
-ZEND_API int zend_list_insert(void *ptr, int type TSRMLS_DC)
+ZEND_API zend_int_t zend_list_insert(void *ptr, int type TSRMLS_DC)
{
- int index;
+ zend_int_t index;
zend_rsrc_list_entry le;
le.ptr=ptr;
@@ -47,7 +47,7 @@ ZEND_API int zend_list_insert(void *ptr, int type TSRMLS_DC)
return index;
}
-ZEND_API int _zend_list_delete(int id TSRMLS_DC)
+ZEND_API int _zend_list_delete(zend_int_t id TSRMLS_DC)
{
zend_rsrc_list_entry *le;
@@ -64,7 +64,7 @@ ZEND_API int _zend_list_delete(int id TSRMLS_DC)
}
-ZEND_API void *_zend_list_find(int id, int *type TSRMLS_DC)
+ZEND_API void *_zend_list_find(zend_int_t id, int *type TSRMLS_DC)
{
zend_rsrc_list_entry *le;
@@ -77,7 +77,7 @@ ZEND_API void *_zend_list_find(int id, int *type TSRMLS_DC)
}
}
-ZEND_API int _zend_list_addref(int id TSRMLS_DC)
+ZEND_API int _zend_list_addref(zend_int_t id TSRMLS_DC)
{
zend_rsrc_list_entry *le;
@@ -91,9 +91,9 @@ ZEND_API int _zend_list_addref(int id TSRMLS_DC)
}
-ZEND_API int zend_register_resource(zval *rsrc_result, void *rsrc_pointer, int rsrc_type TSRMLS_DC)
+ZEND_API zend_int_t zend_register_resource(zval *rsrc_result, void *rsrc_pointer, int rsrc_type
TSRMLS_DC)
{
- int rsrc_id;
+ zend_int_t rsrc_id;
rsrc_id = zend_list_insert(rsrc_pointer, rsrc_type TSRMLS_CC);
@@ -106,9 +106,9 @@ ZEND_API int zend_register_resource(zval *rsrc_result, void *rsrc_pointer, int r
}
-ZEND_API void *zend_fetch_resource(zval **passed_id TSRMLS_DC, int default_id, const char
*resource_type_name, int *found_resource_type, int num_resource_types, ...)
+ZEND_API void *zend_fetch_resource(zval **passed_id TSRMLS_DC, zend_int_t default_id, const char
*resource_type_name, int *found_resource_type, int num_resource_types, ...)
{
- int id;
+ zend_int_t id;
int actual_resource_type;
void *resource;
va_list resource_types;
diff --git a/Zend/zend_list.h b/Zend/zend_list.h
index 23f5114..bcceb6a 100644
--- a/Zend/zend_list.h
+++ b/Zend/zend_list.h
@@ -33,7 +33,7 @@ BEGIN_EXTERN_C()
typedef struct _zend_rsrc_list_entry {
void *ptr;
int type;
- int refcount;
+ zend_int_t refcount;
} zend_rsrc_list_entry;
typedef void (*rsrc_dtor_func_t)(zend_rsrc_list_entry *rsrc TSRMLS_DC);
@@ -70,17 +70,17 @@ void zend_destroy_rsrc_list(HashTable *ht TSRMLS_DC);
int zend_init_rsrc_list_dtors(void);
void zend_destroy_rsrc_list_dtors(void);
-ZEND_API int zend_list_insert(void *ptr, int type TSRMLS_DC);
-ZEND_API int _zend_list_addref(int id TSRMLS_DC);
-ZEND_API int _zend_list_delete(int id TSRMLS_DC);
-ZEND_API void *_zend_list_find(int id, int *type TSRMLS_DC);
+ZEND_API zend_int_t zend_list_insert(void *ptr, int type TSRMLS_DC);
+ZEND_API int _zend_list_addref(zend_int_t id TSRMLS_DC);
+ZEND_API int _zend_list_delete(zend_int_t id TSRMLS_DC);
+ZEND_API void *_zend_list_find(zend_int_t id, int *type TSRMLS_DC);
#define zend_list_addref(id) _zend_list_addref(id TSRMLS_CC)
#define zend_list_delete(id) _zend_list_delete(id TSRMLS_CC)
#define zend_list_find(id, type) _zend_list_find(id, type TSRMLS_CC)
-ZEND_API int zend_register_resource(zval *rsrc_result, void *rsrc_pointer, int rsrc_type
TSRMLS_DC);
-ZEND_API void *zend_fetch_resource(zval **passed_id TSRMLS_DC, int default_id, const char
*resource_type_name, int *found_resource_type, int num_resource_types, ...);
+ZEND_API zend_int_t zend_register_resource(zval *rsrc_result, void *rsrc_pointer, int rsrc_type
TSRMLS_DC);
+ZEND_API void *zend_fetch_resource(zval **passed_id TSRMLS_DC, zend_int_t default_id, const char
*resource_type_name, int *found_resource_type, int num_resource_types, ...);
ZEND_API const char *zend_rsrc_list_get_rsrc_type(int resource TSRMLS_DC);
ZEND_API int zend_fetch_list_dtor_id(char *type_name);