Re: [PHP4BETA] cvs: /php4/sapi/apache mod_php4.c

On Mon, Jan 17, 2000 at 05:33:37PM -0000, Zeev Suraski wrote: > zeev Mon Jan 17 09:33:37 2000 EDT > > Modified files: > /php4/sapi/apache mod_php4.c > Log: > Destructors no longer return ints, the low level problem it was intended to solve is long > gone now... are we sure about that? please see _odbc_stmt_cleanup() in php_odbc.c & _clean_invalid_results() in sybase.c i'm quite positive about that change, but does it break something? tc > > > Index: php4/sapi/apache/mod_php4.c > diff -u php4/sapi/apache/mod_php4.c:1.12 php4/sapi/apache/mod_php4.c:1.13 > --- php4/sapi/apache/mod_php4.c:1.12 Thu Jan 13 09:37:21 2000 > +++ php4/sapi/apache/mod_php4.c Mon Jan 17 09:33:37 2000 > @@ -17,7 +17,7 @@ > | PHP 4.0 patches by Zeev Suraski <zeev@zend.com> | > +----------------------------------------------------------------------+ > */ > -/* $Id: mod_php4.c,v 1.12 2000/01/13 17:37:21 zeev Exp $ */ > +/* $Id: mod_php4.c,v 1.13 2000/01/17 17:33:37 zeev Exp $ */ > > #include "zend.h" > #include "php.h" > @@ -389,11 +389,10 @@ > } > > > -static int destroy_per_dir_entry(php_per_dir_entry *per_dir_entry) > +static void destroy_per_dir_entry(php_per_dir_entry *per_dir_entry) > { > free(per_dir_entry->key); > free(per_dir_entry->value); > - return 1; > } > > static void copy_per_dir_entry(php_per_dir_entry *per_dir_entry) > @@ -421,7 +420,7 @@ > HashTable *per_dir_info; > > per_dir_info = (HashTable *) malloc(sizeof(HashTable)); > - zend_hash_init(per_dir_info, 5, NULL, (int (*)(void *)) destroy_per_dir_entry, 1); > + zend_hash_init(per_dir_info, 5, NULL, (void (*)(void *)) destroy_per_dir_entry, 1); > register_cleanup(p, (void *) per_dir_info, (void (*)(void *)) php_destroy_per_dir_info, (void > (*)(void *)) zend_hash_destroy); > > return per_dir_info; > > > > -- > PHP 4.0 Beta Mailing List <http://www.php.net/version4/> > To unsubscribe, e-mail: php4beta-unsubscribe@lists.php.net > For additional commands, e-mail: php4beta-help@lists.php.net > To contact the list administrators, e-mail: php4beta-admin@lists.php.net > -- Thies C. Arntzen "One Big-Mac, Small Fries and a Coke!" Digital Collections Phone +49 40 235350 Fax +49 40 23535180 Hammerbrookstr. 93 20097 Hamburg / Germany