com php-src: remaining replacements ulong vs zend_uint_t: Zend/zend_compile.c Zend/zend_compile.h Zend/zen d_constants.c Zend/zend_constants.h
Zend/zend_exe cute.c Zend/zend_execute.h Zend/zend_iterators.h Zend/zend_object_handlers.c Zend/zend_string.c Zend/zend_ts_hash.c
Zend/zend_ts_hash.h

From: Date: Thu, 07 Nov 2013 18:41:57 +0000
Subject: com php-src: remaining replacements ulong vs zend_uint_t: Zend/zend_compile.c Zend/zend_compile.h Zend/zen d_constants.c Zend/zend_constants.h
Zend/zend_exe cute.c Zend/zend_execute.h Zend/zend_iterators.h Zend/zend_object_handlers.c Zend/zend_string.c Zend/zend_ts_hash.c
Zend/zend_ts_hash.h
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-73903@lists.php.net to get a copy of this message
Commit: 11d4bcd706188c92bb5725e741726fae7d78e695 Author: Anatol Belski <ab@php.net> Thu, 7 Nov 2013 19:41:57 +0100 Parents: df312c5ddf9c2762f1760d37e3146a234bf8b32f Branches: str_size_and_int64 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=11d4bcd706188c92bb5725e741726fae7d78e695 Log: remaining replacements ulong vs zend_uint_t Changed paths: M Zend/zend_compile.c M Zend/zend_compile.h M Zend/zend_constants.c M Zend/zend_constants.h M Zend/zend_execute.c M Zend/zend_execute.h M Zend/zend_iterators.h M Zend/zend_object_handlers.c M Zend/zend_string.c M Zend/zend_ts_hash.c M Zend/zend_ts_hash.h

diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 0bfb254..0e2f49f 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -285,10 +285,10 @@ static zend_uint get_temporary_variable(zend_op_array *op_array) /* {{{ */ } /* }}} */ -static int lookup_cv(zend_op_array *op_array, char* name, zend_str_size_int name_len, ulong hash TSRMLS_DC) /* {{{ */ +static int lookup_cv(zend_op_array *op_array, char* name, zend_str_size_int name_len, zend_uint_t hash TSRMLS_DC) /* {{{ */ { int i = 0; - ulong hash_value = hash ? hash : zend_inline_hash_func(name, name_len+1); + zend_uint_t hash_value = hash ? hash : zend_inline_hash_func(name, name_len+1); while (i < op_array->last_var) { if (op_array->vars[i].name == name || @@ -650,7 +650,7 @@ void fetch_simple_variable_ex(znode *result, znode *varname, int bp, zend_uchar zend_llist *fetch_list_ptr; if (varname->op_type == IS_CONST) { - ulong hash; + zend_uint_t hash; if (Z_TYPE(varname->u.constant) != IS_STRING) { convert_to_string(&varname->u.constant); @@ -817,7 +817,7 @@ void fetch_array_dim(znode *result, const znode *parent, const znode *dim TSRMLS SET_NODE(opline.op1, parent); SET_NODE(opline.op2, dim); if (opline.op2_type == IS_CONST && Z_TYPE(CONSTANT(opline.op2.constant)) == IS_STRING) { - ulong index; + zend_uint_t index; int numeric = 0; ZEND_HANDLE_NUMERIC_EX(Z_STRVAL(CONSTANT(opline.op2.constant)), Z_STRSIZE(CONSTANT(opline.op2.constant))+1, index, numeric = 1); @@ -1562,7 +1562,7 @@ void zend_do_begin_function_declaration(znode *function_token, znode *function_n op_array.line_start = zend_get_compiled_lineno(TSRMLS_C); if (is_method) { - zend_ulong hash; + zend_uint_t hash; lcname = zend_new_interned_string(zend_str_tolower_dup(name, name_len), name_len + 1, 1 TSRMLS_CC); hash = str_hash(lcname, name_len); @@ -3875,7 +3875,7 @@ static void zend_add_magic_methods(zend_class_entry* ce, const char* mname, zend static void zend_add_trait_method(zend_class_entry *ce, const char *name, const char *arKey, zend_str_size_uint nKeyLength, zend_function *fn, HashTable **overriden TSRMLS_DC) /* {{{ */ { zend_function *existing_fn = NULL; - ulong h = zend_hash_func(arKey, nKeyLength); + zend_uint_t h = zend_hash_func(arKey, nKeyLength); if (zend_hash_quick_find(&ce->function_table, arKey, nKeyLength, h, (void**) &existing_fn) == SUCCESS) { if (existing_fn->common.scope == ce) { @@ -4222,7 +4222,7 @@ static void zend_do_traits_method_binding(zend_class_entry *ce TSRMLS_DC) /* {{{ } /* }}} */ -static zend_class_entry* find_first_definition(zend_class_entry *ce, size_t current_trait, const char* prop_name, zend_str_size_int prop_name_length, ulong prop_hash, zend_class_entry *coliding_ce) /* {{{ */ +static zend_class_entry* find_first_definition(zend_class_entry *ce, size_t current_trait, const char* prop_name, zend_str_size_int prop_name_length, zend_uint_t prop_hash, zend_class_entry *coliding_ce) /* {{{ */ { size_t i; @@ -4246,7 +4246,7 @@ static void zend_do_traits_property_binding(zend_class_entry *ce TSRMLS_DC) /* { zval compare_result; const char* prop_name; zend_str_size prop_name_length; - ulong prop_hash; + zend_uint_t prop_hash; const char* class_name_unused; zend_bool not_compatible; zval* prop_value; @@ -5316,7 +5316,7 @@ void zend_do_declare_class_constant(znode *var_name, const znode *value TSRMLS_D { zval *property; const char *cname = NULL; - zend_ulong hash; + zend_uint_t hash; if(Z_TYPE(value->u.constant) == IS_CONSTANT_ARRAY) { zend_error_noreturn(E_COMPILE_ERROR, "Arrays are not allowed in class constants"); @@ -5559,7 +5559,7 @@ void zend_do_fetch_constant(znode *result, znode *constant_container, znode *con zend_op *opline; int type; char *compound; - ulong fetch_type = 0; + zend_uint_t fetch_type = 0; if (constant_container) { switch (mode) { @@ -5715,7 +5715,7 @@ void zend_do_init_array(znode *result, const znode *expr, const znode *offset, z if (offset) { SET_NODE(opline->op2, offset); if (opline->op2_type == IS_CONST && Z_TYPE(CONSTANT(opline->op2.constant)) == IS_STRING) { - ulong index; + zend_uint_t index; int numeric = 0; ZEND_HANDLE_NUMERIC_EX(Z_STRVAL(CONSTANT(opline->op2.constant)), Z_STRSIZE(CONSTANT(opline->op2.constant))+1, index, numeric = 1); @@ -5747,7 +5747,7 @@ void zend_do_add_array_element(znode *result, const znode *expr, const znode *of if (offset) { SET_NODE(opline->op2, offset); if (opline->op2_type == IS_CONST && Z_TYPE(CONSTANT(opline->op2.constant)) == IS_STRING) { - ulong index; + zend_uint_t index; int numeric = 0; ZEND_HANDLE_NUMERIC_EX(Z_STRVAL(CONSTANT(opline->op2.constant)), Z_STRSIZE(CONSTANT(opline->op2.constant))+1, index, numeric = 1); @@ -6680,7 +6680,7 @@ void zend_do_ticks(TSRMLS_D) /* {{{ */ } /* }}} */ -zend_bool zend_is_auto_global_quick(const char *name, zend_str_size_uint name_len, ulong hash TSRMLS_DC) /* {{{ */ +zend_bool zend_is_auto_global_quick(const char *name, zend_str_size_uint name_len, zend_uint_t hash TSRMLS_DC) /* {{{ */ { zend_auto_global *auto_global; diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h index 5679c8d..bac6f7d 100644 --- a/Zend/zend_compile.h +++ b/Zend/zend_compile.h @@ -67,7 +67,7 @@ typedef struct _zend_compiler_context { typedef struct _zend_literal { zval constant; - zend_ulong hash_value; + zend_uint_t hash_value; zend_uint cache_slot; } zend_literal; @@ -78,7 +78,7 @@ typedef union _znode_op { zend_uint constant; zend_uint var; zend_uint num; - zend_ulong hash; + zend_uint_t hash; zend_uint opline_num; /* Needs to be signed */ zend_op *jmp_addr; zval *zv; @@ -111,7 +111,7 @@ struct _zend_op { znode_op op1; znode_op op2; znode_op result; - ulong extended_value; + zend_uint_t extended_value; zend_str_size_uint lineno; zend_uchar opcode; zend_uchar op1_type; @@ -219,7 +219,7 @@ typedef struct _zend_property_info { zend_uint flags; const char *name; int name_length; - ulong h; + zend_uint_t h; int offset; const char *doc_comment; int doc_comment_len; @@ -256,7 +256,7 @@ typedef struct _zend_internal_function_info { typedef struct _zend_compiled_variable { const char *name; zend_str_size_int name_len; - ulong hash_value; + zend_uint_t hash_value; } zend_compiled_variable; struct _zend_op_array { @@ -708,7 +708,7 @@ typedef struct _zend_auto_global { ZEND_API int zend_register_auto_global(const char *name, zend_str_size_uint name_len, zend_bool jit, zend_auto_global_callback auto_global_callback TSRMLS_DC); ZEND_API void zend_activate_auto_globals(TSRMLS_D); ZEND_API zend_bool zend_is_auto_global(const char *name, zend_str_size_uint name_len TSRMLS_DC); -ZEND_API zend_bool zend_is_auto_global_quick(const char *name, zend_str_size_uint name_len, ulong hashval TSRMLS_DC); +ZEND_API zend_bool zend_is_auto_global_quick(const char *name, zend_str_size_uint name_len, zend_uint_t hashval TSRMLS_DC); ZEND_API size_t zend_dirname(char *path, size_t len); int zendlex(znode *zendlval TSRMLS_DC); diff --git a/Zend/zend_constants.c b/Zend/zend_constants.c index dd76472..f95781d 100644 --- a/Zend/zend_constants.c +++ b/Zend/zend_constants.c @@ -299,7 +299,7 @@ ZEND_API int zend_get_constant(const char *name, zend_str_size_uint name_len, zv return retval; } -ZEND_API int zend_get_constant_ex(const char *name, zend_str_size_uint name_len, zval *result, zend_class_entry *scope, ulong flags TSRMLS_DC) +ZEND_API int zend_get_constant_ex(const char *name, zend_str_size_uint name_len, zval *result, zend_class_entry *scope, zend_uint_t flags TSRMLS_DC) { zend_constant *c; int retval = 1; @@ -435,7 +435,7 @@ finish: return zend_get_constant(name, name_len, result TSRMLS_CC); } -zend_constant *zend_quick_get_constant(const zend_literal *key, ulong flags TSRMLS_DC) +zend_constant *zend_quick_get_constant(const zend_literal *key, zend_uint_t flags TSRMLS_DC) { zend_constant *c; @@ -472,7 +472,7 @@ ZEND_API int zend_register_constant(zend_constant *c TSRMLS_DC) char *lowercase_name = NULL; char *name; int ret = SUCCESS; - ulong chash; + zend_uint_t chash; #if 0 printf("Registering constant for module %d\n", c->module_number); diff --git a/Zend/zend_constants.h b/Zend/zend_constants.h index c6cf014..6effd64 100644 --- a/Zend/zend_constants.h +++ b/Zend/zend_constants.h @@ -67,7 +67,7 @@ int zend_shutdown_constants(TSRMLS_D); void zend_register_standard_constants(TSRMLS_D); void clean_non_persistent_constants(TSRMLS_D); ZEND_API int zend_get_constant(const char *name, zend_str_size_uint name_len, zval *result TSRMLS_DC); -ZEND_API int zend_get_constant_ex(const char *name, zend_str_size_uint name_len, zval *result, zend_class_entry *scope, ulong flags TSRMLS_DC); +ZEND_API int zend_get_constant_ex(const char *name, zend_str_size_uint name_len, zval *result, zend_class_entry *scope, zend_uint_t flags TSRMLS_DC); ZEND_API void zend_register_long_constant(const char *name, zend_str_size_uint name_len, zend_int_t lval, int flags, int module_number TSRMLS_DC); ZEND_API void zend_register_double_constant(const char *name, zend_str_size_uint name_len, double dval, int flags, int module_number TSRMLS_DC); ZEND_API void zend_register_string_constant(const char *name, zend_str_size_uint name_len, char *strval, int flags, int module_number TSRMLS_DC); @@ -77,7 +77,7 @@ ZEND_API void zend_register_null_constant(const char *name, zend_str_size_uint n ZEND_API int zend_register_constant(zend_constant *c TSRMLS_DC); void zend_copy_constants(HashTable *target, HashTable *sourc); void copy_zend_constant(zend_constant *c); -zend_constant *zend_quick_get_constant(const zend_literal *key, ulong flags TSRMLS_DC); +zend_constant *zend_quick_get_constant(const zend_literal *key, zend_uint_t flags TSRMLS_DC); END_EXTERN_C() #define ZEND_CONSTANT_DTOR (void (*)(void *)) free_zend_constant diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index 82a01d4..94593d3 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -575,7 +575,7 @@ static inline void make_real_object(zval **object_ptr TSRMLS_DC) } } -ZEND_API char * zend_verify_arg_class_kind(const zend_arg_info *cur_arg_info, ulong fetch_type, const char **class_name, zend_class_entry **pce TSRMLS_DC) +ZEND_API char * zend_verify_arg_class_kind(const zend_arg_info *cur_arg_info, zend_uint_t fetch_type, const char **class_name, zend_class_entry **pce TSRMLS_DC) { *pce = zend_fetch_class(cur_arg_info->class_name, cur_arg_info->class_name_len, (fetch_type | ZEND_FETCH_CLASS_AUTO | ZEND_FETCH_CLASS_NO_AUTOLOAD) TSRMLS_CC); @@ -610,7 +610,7 @@ ZEND_API int zend_verify_arg_error(int error_type, const zend_function *zf, zend return 0; } -static inline int zend_verify_arg_type(zend_function *zf, zend_uint arg_num, zval *arg, ulong fetch_type TSRMLS_DC) +static inline int zend_verify_arg_type(zend_function *zf, zend_uint arg_num, zval *arg, zend_uint_t fetch_type TSRMLS_DC) { zend_arg_info *cur_arg_info; char *need_msg; @@ -1000,7 +1000,7 @@ static inline zval **zend_fetch_dimension_address_inner(HashTable *ht, const zva zval **retval; char *offset_key; int offset_key_length; - ulong hval; + zend_uint_t hval; switch (dim->type) { case IS_NULL: diff --git a/Zend/zend_execute.h b/Zend/zend_execute.h index 57f6256..c01f640 100644 --- a/Zend/zend_execute.h +++ b/Zend/zend_execute.h @@ -68,7 +68,7 @@ ZEND_API int zend_eval_stringl(char *str, zend_str_size_int str_len, zval *retva ZEND_API int zend_eval_string_ex(char *str, zval *retval_ptr, char *string_name, int handle_exceptions TSRMLS_DC); ZEND_API int zend_eval_stringl_ex(char *str, zend_str_size_int str_len, zval *retval_ptr, char *string_name, int handle_exceptions TSRMLS_DC); -ZEND_API char * zend_verify_arg_class_kind(const zend_arg_info *cur_arg_info, ulong fetch_type, const char **class_name, zend_class_entry **pce TSRMLS_DC); +ZEND_API char * zend_verify_arg_class_kind(const zend_arg_info *cur_arg_info, zend_uint_t fetch_type, const char **class_name, zend_class_entry **pce TSRMLS_DC); ZEND_API int zend_verify_arg_error(int error_type, const zend_function *zf, zend_uint arg_num, const char *need_msg, const char *need_kind, const char *given_msg, const char *given_kind TSRMLS_DC); static zend_always_inline void i_zval_ptr_dtor(zval *zval_ptr ZEND_FILE_LINE_DC TSRMLS_DC) diff --git a/Zend/zend_iterators.h b/Zend/zend_iterators.h index f74068a..083566f 100644 --- a/Zend/zend_iterators.h +++ b/Zend/zend_iterators.h @@ -57,7 +57,7 @@ typedef struct _zend_object_iterator_funcs { struct _zend_object_iterator { void *data; zend_object_iterator_funcs *funcs; - ulong index; /* private to fe_reset/fe_fetch opcodes */ + zend_uint_t index; /* private to fe_reset/fe_fetch opcodes */ }; typedef struct _zend_class_iterator_funcs { diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c index 3c5f9c4..0b99e00 100644 --- a/Zend/zend_object_handlers.c +++ b/Zend/zend_object_handlers.c @@ -272,7 +272,7 @@ static zend_always_inline struct _zend_property_info *zend_get_property_info_qui zend_property_info *property_info; zend_property_info *scope_property_info; zend_bool denied_access = 0; - ulong h; + zend_uint_t h; if (key && (property_info = CACHED_POLYMORPHIC_PTR(key->cache_slot, ce)) != NULL) { return property_info; @@ -913,7 +913,7 @@ ZEND_API void zend_std_call_user_call(INTERNAL_FUNCTION_PARAMETERS) /* {{{ */ * Returns the function address that should be called, or NULL * if no such function exists. */ -static inline zend_function *zend_check_private_int(zend_function *fbc, zend_class_entry *ce, char *function_name_strval, zend_str_size_int function_name_strlen, ulong hash_value TSRMLS_DC) /* {{{ */ +static inline zend_function *zend_check_private_int(zend_function *fbc, zend_class_entry *ce, char *function_name_strval, zend_str_size_int function_name_strlen, zend_uint_t hash_value TSRMLS_DC) /* {{{ */ { if (!ce) { return 0; @@ -1004,7 +1004,7 @@ static union _zend_function *zend_std_get_method(zval **object_ptr, char *method zend_function *fbc; zval *object = *object_ptr; zend_object *zobj = Z_OBJ_P(object); - ulong hash_value; + zend_uint_t hash_value; char *lc_method_name; ALLOCA_FLAG(use_heap) @@ -1145,7 +1145,7 @@ ZEND_API zend_function *zend_std_get_static_method(zend_class_entry *ce, const c { zend_function *fbc = NULL; char *lc_class_name, *lc_function_name = NULL; - ulong hash_value; + zend_uint_t hash_value; ALLOCA_FLAG(use_heap) if (EXPECTED(key != NULL)) { @@ -1233,7 +1233,7 @@ ZEND_API zend_function *zend_std_get_static_method(zend_class_entry *ce, const c ZEND_API zval **zend_std_get_static_property(zend_class_entry *ce, const char *property_name, zend_str_size_int property_name_len, zend_bool silent, const zend_literal *key TSRMLS_DC) /* {{{ */ { zend_property_info *property_info; - ulong hash_value; + zend_uint_t hash_value; if (UNEXPECTED(!key) || (property_info = CACHED_POLYMORPHIC_PTR(key->cache_slot, ce)) == NULL) { diff --git a/Zend/zend_string.c b/Zend/zend_string.c index 144de9d..d5f3060 100644 --- a/Zend/zend_string.c +++ b/Zend/zend_string.c @@ -82,7 +82,7 @@ void zend_interned_strings_dtor(TSRMLS_D) static const char *zend_new_interned_string_int(const char *arKey, zend_str_size_int nKeyLength, int free_src TSRMLS_DC) { #ifndef ZTS - ulong h; + zend_uint_t h; uint nIndex; Bucket *p; diff --git a/Zend/zend_ts_hash.c b/Zend/zend_ts_hash.c index f517fe8..7b6c417 100644 --- a/Zend/zend_ts_hash.c +++ b/Zend/zend_ts_hash.c @@ -110,7 +110,7 @@ ZEND_API int _zend_ts_hash_add_or_update(TsHashTable *ht, char *arKey, uint nKey return retval; } -ZEND_API int _zend_ts_hash_quick_add_or_update(TsHashTable *ht, char *arKey, uint nKeyLength, ulong h, void *pData, uint nDataSize, void **pDest, int flag ZEND_FILE_LINE_DC) +ZEND_API int _zend_ts_hash_quick_add_or_update(TsHashTable *ht, char *arKey, uint nKeyLength, zend_uint_t h, void *pData, uint nDataSize, void **pDest, int flag ZEND_FILE_LINE_DC) { int retval; @@ -121,7 +121,7 @@ ZEND_API int _zend_ts_hash_quick_add_or_update(TsHashTable *ht, char *arKey, uin return retval; } -ZEND_API int _zend_ts_hash_index_update_or_next_insert(TsHashTable *ht, ulong h, void *pData, uint nDataSize, void **pDest, int flag ZEND_FILE_LINE_DC) +ZEND_API int _zend_ts_hash_index_update_or_next_insert(TsHashTable *ht, zend_uint_t h, void *pData, uint nDataSize, void **pDest, int flag ZEND_FILE_LINE_DC) { int retval; @@ -187,7 +187,7 @@ ZEND_API void zend_ts_hash_reverse_apply(TsHashTable *ht, apply_func_t apply_fun end_write(ht); } -ZEND_API int zend_ts_hash_del_key_or_index(TsHashTable *ht, char *arKey, uint nKeyLength, ulong h, int flag) +ZEND_API int zend_ts_hash_del_key_or_index(TsHashTable *ht, char *arKey, uint nKeyLength, zend_uint_t h, int flag) { int retval; @@ -198,9 +198,9 @@ ZEND_API int zend_ts_hash_del_key_or_index(TsHashTable *ht, char *arKey, uint nK return retval; } -ZEND_API ulong zend_ts_get_hash_value(TsHashTable *ht, char *arKey, uint nKeyLength) +ZEND_API zend_uint_t zend_ts_get_hash_value(TsHashTable *ht, char *arKey, uint nKeyLength) { - ulong retval; + zend_uint_t retval; begin_read(ht); retval = zend_get_hash_value(arKey, nKeyLength); @@ -220,7 +220,7 @@ ZEND_API int zend_ts_hash_find(TsHashTable *ht, char *arKey, uint nKeyLength, vo return retval; } -ZEND_API int zend_ts_hash_quick_find(TsHashTable *ht, char *arKey, uint nKeyLength, ulong h, void **pData) +ZEND_API int zend_ts_hash_quick_find(TsHashTable *ht, char *arKey, uint nKeyLength, zend_uint_t h, void **pData) { int retval; @@ -231,7 +231,7 @@ ZEND_API int zend_ts_hash_quick_find(TsHashTable *ht, char *arKey, uint nKeyLeng return retval; } -ZEND_API int zend_ts_hash_index_find(TsHashTable *ht, ulong h, void **pData) +ZEND_API int zend_ts_hash_index_find(TsHashTable *ht, zend_uint_t h, void **pData) { int retval; @@ -253,7 +253,7 @@ ZEND_API int zend_ts_hash_exists(TsHashTable *ht, char *arKey, uint nKeyLength) return retval; } -ZEND_API int zend_ts_hash_index_exists(TsHashTable *ht, ulong h) +ZEND_API int zend_ts_hash_index_exists(TsHashTable *ht, zend_uint_t h) { int retval; diff --git a/Zend/zend_ts_hash.h b/Zend/zend_ts_hash.h index 9a849e1..059a685 100644 --- a/Zend/zend_ts_hash.h +++ b/Zend/zend_ts_hash.h @@ -55,13 +55,13 @@ ZEND_API int _zend_ts_hash_add_or_update(TsHashTable *ht, char *arKey, uint nKey #define zend_ts_hash_add(ht, arKey, nKeyLength, pData, nDataSize, pDest) \ _zend_ts_hash_add_or_update(ht, arKey, nKeyLength, pData, nDataSize, pDest, HASH_ADD ZEND_FILE_LINE_CC) -ZEND_API int _zend_ts_hash_quick_add_or_update(TsHashTable *ht, char *arKey, uint nKeyLength, ulong h, void *pData, uint nDataSize, void **pDest, int flag ZEND_FILE_LINE_DC); +ZEND_API int _zend_ts_hash_quick_add_or_update(TsHashTable *ht, char *arKey, uint nKeyLength, zend_uint_t h, void *pData, uint nDataSize, void **pDest, int flag ZEND_FILE_LINE_DC); #define zend_ts_hash_quick_update(ht, arKey, nKeyLength, h, pData, nDataSize, pDest) \ _zend_ts_hash_quick_add_or_update(ht, arKey, nKeyLength, h, pData, nDataSize, pDest, HASH_UPDATE ZEND_FILE_LINE_CC) #define zend_ts_hash_quick_add(ht, arKey, nKeyLength, h, pData, nDataSize, pDest) \ _zend_ts_hash_quick_add_or_update(ht, arKey, nKeyLength, h, pData, nDataSize, pDest, HASH_ADD ZEND_FILE_LINE_CC) -ZEND_API int _zend_ts_hash_index_update_or_next_insert(TsHashTable *ht, ulong h, void *pData, uint nDataSize, void **pDest, int flag ZEND_FILE_LINE_DC); +ZEND_API int _zend_ts_hash_index_update_or_next_insert(TsHashTable *ht, zend_uint_t h, void *pData, uint nDataSize, void **pDest, int flag ZEND_FILE_LINE_DC); #define zend_ts_hash_index_update(ht, h, pData, nDataSize, pDest) \ _zend_ts_hash_index_update_or_next_insert(ht, h, pData, nDataSize, pDest, HASH_UPDATE ZEND_FILE_LINE_CC) #define zend_ts_hash_next_index_insert(ht, pData, nDataSize, pDest) \ @@ -78,22 +78,22 @@ ZEND_API void zend_ts_hash_reverse_apply(TsHashTable *ht, apply_func_t apply_fun /* Deletes */ -ZEND_API int zend_ts_hash_del_key_or_index(TsHashTable *ht, char *arKey, uint nKeyLength, ulong h, int flag); +ZEND_API int zend_ts_hash_del_key_or_index(TsHashTable *ht, char *arKey, uint nKeyLength, zend_uint_t h, int flag); #define zend_ts_hash_del(ht, arKey, nKeyLength) \ zend_ts_hash_del_key_or_index(ht, arKey, nKeyLength, 0, HASH_DEL_KEY) #define zend_ts_hash_index_del(ht, h) \ zend_ts_hash_del_key_or_index(ht, NULL, 0, h, HASH_DEL_INDEX) -ZEND_API ulong zend_ts_get_hash_value(TsHashTable *ht, char *arKey, uint nKeyLength); +ZEND_API zend_uint_t zend_ts_get_hash_value(TsHashTable *ht, char *arKey, uint nKeyLength); /* Data retreival */ ZEND_API int zend_ts_hash_find(TsHashTable *ht, char *arKey, uint nKeyLength, void **pData); -ZEND_API int zend_ts_hash_quick_find(TsHashTable *ht, char *arKey, uint nKeyLength, ulong h, void **pData); -ZEND_API int zend_ts_hash_index_find(TsHashTable *ht, ulong h, void **pData); +ZEND_API int zend_ts_hash_quick_find(TsHashTable *ht, char *arKey, uint nKeyLength, zend_uint_t h, void **pData); +ZEND_API int zend_ts_hash_index_find(TsHashTable *ht, zend_uint_t h, void **pData); /* Misc */ ZEND_API int zend_ts_hash_exists(TsHashTable *ht, char *arKey, uint nKeyLength); -ZEND_API int zend_ts_hash_index_exists(TsHashTable *ht, ulong h); +ZEND_API int zend_ts_hash_index_exists(TsHashTable *ht, zend_uint_t h); /* Copying, merging and sorting */ ZEND_API void zend_ts_hash_copy(TsHashTable *target, TsHashTable *source, copy_ctor_func_t pCopyConstructor, void *tmp, uint size); @@ -108,7 +108,7 @@ ZEND_API int zend_ts_hash_num_elements(TsHashTable *ht); ZEND_API int zend_ts_hash_rehash(TsHashTable *ht); -ZEND_API ulong zend_ts_hash_func(char *arKey, uint nKeyLength); +ZEND_API zend_uint_t zend_ts_hash_func(char *arKey, uint nKeyLength); #if ZEND_DEBUG /* debug */
« previous php.cvs (#73903) next »