CVS update: php3

Date: Wednesday June 23, 1999 @ 14:51 Author: jim Update of /repository/php3 In directory php:/tmp/cvs-serv25999 Modified Files: php3_hash.c Log Message: __FUNCTION__ is non-standard. Use __FILE__ and __LINE__ instead. Index: php3/php3_hash.c diff -u php3/php3_hash.c:1.9 php3/php3_hash.c:1.10 --- php3/php3_hash.c:1.9 Tue Jun 22 06:18:19 1999 +++ php3/php3_hash.c Wed Jun 23 14:51:44 1999 @@ -29,7 +29,7 @@ */ -/* $Id: php3_hash.c,v 1.9 1999/06/22 10:18:19 thies Exp $ */ +/* $Id: php3_hash.c,v 1.10 1999/06/23 18:51:44 jim Exp $ */ #ifdef THREAD_SAFE #include "tls.h" #endif @@ -77,14 +77,14 @@ uint nNumPrimeNumbers = sizeof(PrimeNumbers) / sizeof(ulong); #if DEBUG -static void _php3_hash_indestroy(HashTable *ht,char *function) +static void _php3_hash_indestroy(HashTable *ht,char *function, int line) { TLS_VARS; if (ht->indestroy) { - php3_error(E_WARNING, "%s ht=%08x is already destroyed/destroying",function,ht); + php3_error(E_WARNING, "ht=%08x is already destroyed/destroying in %s at line %d",ht,function,line); } } -#define CHECK_INDESTROY(a) _php3_hash_indestroy(a,__FUNCTION__); +#define CHECK_INDESTROY(a) _php3_hash_indestroy(a,__FILE__,__LINE__); #else #define CHECK_INDESTROY(a) #endif