CVS update: php3

Date: Sunday September 20, 1998 @ 18:43 Author: zeev Update of /repository/php3 In directory asf:/u2/tmp/cvs-serv8184 Modified Files: php3_hash.c php3_hash.h Log Message: More 64-bit patches Index: php3/php3_hash.c diff -c php3/php3_hash.c:1.5 php3/php3_hash.c:1.6 *** php3/php3_hash.c:1.5 Sat Sep 19 16:17:29 1998 --- php3/php3_hash.c Sun Sep 20 18:43:44 1998 *************** *** 29,35 **** */ ! /* $Id: php3_hash.c,v 1.5 1998/09/19 20:17:29 zeev Exp $ */ #ifdef THREAD_SAFE #include "tls.h" #endif --- 29,35 ---- */ ! /* $Id: php3_hash.c,v 1.6 1998/09/20 22:43:44 zeev Exp $ */ #ifdef THREAD_SAFE #include "tls.h" #endif *************** *** 946,952 **** } ! PHPAPI int _php3_hash_get_current_key(HashTable *ht, char **str_index, int *int_index) { Bucket *p = ht->pInternalPointer; --- 946,952 ---- } ! PHPAPI int _php3_hash_get_current_key(HashTable *ht, char **str_index, ulong *num_index) { Bucket *p = ht->pInternalPointer; *************** *** 956,963 **** memcpy(*str_index, p->arKey, p->nKeyLength); return HASH_KEY_IS_STRING; } else { ! *int_index = p->h; ! return HASH_KEY_IS_INT; } } return HASH_KEY_NON_EXISTANT; --- 956,963 ---- memcpy(*str_index, p->arKey, p->nKeyLength); return HASH_KEY_IS_STRING; } else { ! *num_index = p->h; ! return HASH_KEY_IS_LONG; } } return HASH_KEY_NON_EXISTANT; Index: php3/php3_hash.h diff -c php3/php3_hash.h:1.5 php3/php3_hash.h:1.6 *** php3/php3_hash.h:1.5 Sat Sep 19 16:17:30 1998 --- php3/php3_hash.h Sun Sep 20 18:43:45 1998 *************** *** 29,35 **** */ ! /* $Id: php3_hash.h,v 1.5 1998/09/19 20:17:30 zeev Exp $ */ #ifndef _HASH_ --- 29,35 ---- */ ! /* $Id: php3_hash.h,v 1.6 1998/09/20 22:43:45 zeev Exp $ */ #ifndef _HASH_ *************** *** 38,44 **** #include <sys/types.h> #define HASH_KEY_IS_STRING 1 ! #define HASH_KEY_IS_INT 2 #define HASH_KEY_NON_EXISTANT 3 #define HASH_UPDATE 0 --- 38,44 ---- #include <sys/types.h> #define HASH_KEY_IS_STRING 1 ! #define HASH_KEY_IS_LONG 2 #define HASH_KEY_NON_EXISTANT 3 #define HASH_UPDATE 0 *************** *** 126,132 **** /* traversing */ extern PHPAPI void _php3_hash_move_forward(HashTable *ht); extern PHPAPI void _php3_hash_move_backwards(HashTable *ht); ! extern PHPAPI int _php3_hash_get_current_key(HashTable *ht, char **str_index, int *int_index); extern PHPAPI int _php3_hash_get_current_data(HashTable *ht, void **pData); extern PHPAPI void _php3_hash_internal_pointer_reset(HashTable *ht); extern PHPAPI void _php3_hash_internal_pointer_end(HashTable *ht); --- 126,132 ---- /* traversing */ extern PHPAPI void _php3_hash_move_forward(HashTable *ht); extern PHPAPI void _php3_hash_move_backwards(HashTable *ht); ! extern PHPAPI int _php3_hash_get_current_key(HashTable *ht, char **str_index, ulong *num_index); extern PHPAPI int _php3_hash_get_current_data(HashTable *ht, void **pData); extern PHPAPI void _php3_hash_internal_pointer_reset(HashTable *ht); extern PHPAPI void _php3_hash_internal_pointer_end(HashTable *ht); -- PHP Development Mailing List http://www.php.net/ To unsubscribe send an empty message to php-dev-unsubscribe@lists.php.net For help: php-dev-help@lists.php.net