cvs: /php4/ext/dba dba.c /php4/ext/dbase dbase.c php_dbase.h

andrey Tue Jul 27 13:09:35 1999 EDT Modified files: /php4/ext/dba dba.c /php4/ext/dbase dbase.c php_dbase.h Log: More symbol work. Index: php4/ext/dba/dba.c diff -u php4/ext/dba/dba.c:1.2 php4/ext/dba/dba.c:1.3 --- php4/ext/dba/dba.c:1.2 Wed Jul 21 11:39:28 1999 +++ php4/ext/dba/dba.c Tue Jul 27 13:09:35 1999 @@ -27,7 +27,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dba.c,v 1.2 1999/07/21 15:39:28 sas Exp $ */ +/* $Id: dba.c,v 1.3 1999/07/27 17:09:35 andrey Exp $ */ #include "php.h" @@ -57,16 +57,16 @@ {NULL,NULL,NULL} }; -static int php3_minit_dba(INIT_FUNC_ARGS); -static int php3_mshutdown_dba(SHUTDOWN_FUNC_ARGS); -static void php3_info_dba(ZEND_MODULES_INFO_FUNC_ARGS); +static PHP_MINIT_FUNCTION(dba); +static PHP_MSHUTDOWN_FUNCTION(dba); +static PHP_MINFO_FUNCTION(dba); php3_module_entry dba_module_entry = { "DataBase API", dba_functions, - php3_minit_dba, - php3_mshutdown_dba, + PHP_MINIT(dba), + PHP_MSHUTDOWN(dba), NULL, NULL, - php3_info_dba, + PHP_MINFO(dba), STANDARD_MODULE_PROPERTIES }; @@ -174,7 +174,7 @@ /* }}} */ /* {{{ php3_minit_dba */ -static int php3_minit_dba(INIT_FUNC_ARGS) +static PHP_MINIT_FUNCTION(dba) { _php3_hash_init(&ht_keys, 0, NULL, NULL, 1); GLOBAL(le_db) = register_list_destructors(dba_close, NULL); @@ -184,7 +184,7 @@ /* }}} */ /* {{{ php3_mshutdown_dba */ -static int php3_mshutdown_dba(SHUTDOWN_FUNC_ARGS) +static PHP_MSHUTDOWN_FUNCTION(dba) { _php3_hash_destroy(&ht_keys); return SUCCESS; @@ -192,11 +192,11 @@ /* }}} */ /* {{{ php3_info_dba */ -static void php3_info_dba(ZEND_MODULE_INFO_FUNC_ARGS) +static PHP_MINFO_FUNCTION(dba) { dba_handler *hptr; - PUTS("V1 ($Id: dba.c,v 1.2 1999/07/21 15:39:28 sas Exp $)"); + PUTS("V1 ($Id: dba.c,v 1.3 1999/07/27 17:09:35 andrey Exp $)"); for(hptr = handler; hptr->name; hptr++) { PUTS(" "); PUTS(hptr->name); Index: php4/ext/dbase/dbase.c diff -u php4/ext/dbase/dbase.c:1.7 php4/ext/dbase/dbase.c:1.8 --- php4/ext/dbase/dbase.c:1.7 Fri Jul 16 09:12:46 1999 +++ php4/ext/dbase/dbase.c Tue Jul 27 13:09:35 1999 @@ -65,7 +65,7 @@ } -int php3_minit_dbase(INIT_FUNC_ARGS) +PHP_MINIT_FUNCTION(dbase) { #if defined(THREAD_SAFE) dbase_global_struct *dbase_globals; @@ -87,7 +87,8 @@ return SUCCESS; } -static int php3_mend_dbase(void){ +static PHP_MSHUTDOWN_FUNCTION(dbase) +{ #if defined(THREAD_SAFE) dbase_global_struct *dbase_globals; dbase_globals = TlsGetValue(DbaseTls); @@ -707,22 +708,22 @@ /* }}} */ function_entry dbase_functions[] = { - {"dbase_open", php3_dbase_open, NULL}, - {"dbase_create", php3_dbase_create, NULL}, - {"dbase_close", php3_dbase_close, NULL}, - {"dbase_numrecords", php3_dbase_numrecords, NULL}, - {"dbase_numfields", php3_dbase_numfields, NULL}, - {"dbase_add_record", php3_dbase_add_record, NULL}, - {"dbase_replace_record", php3_dbase_replace_record, NULL}, - {"dbase_get_record", php3_dbase_get_record, NULL}, - {"dbase_get_record_with_names", php3_dbase_get_record_with_names, NULL}, - {"dbase_delete_record", php3_dbase_delete_record, NULL}, - {"dbase_pack", php3_dbase_pack, NULL}, + PHP_FUNCTION(dbase_open, NULL) + PHP_FUNCTION(dbase_create, NULL) + PHP_FUNCTION(dbase_close, NULL) + PHP_FUNCTION(dbase_numrecords, NULL) + PHP_FUNCTION(dbase_numfields, NULL) + PHP_FUNCTION(dbase_add_record, NULL) + PHP_FUNCTION(dbase_replace_record, NULL) + PHP_FUNCTION(dbase_get_record, NULL) + PHP_FUNCTION(dbase_get_record_with_names, NULL) + PHP_FUNCTION(dbase_delete_record, NULL) + PHP_FUNCTION(dbase_pack, NULL) {NULL, NULL, NULL} }; php3_module_entry dbase_module_entry = { - "DBase", dbase_functions, php3_minit_dbase, php3_mend_dbase, NULL, NULL, NULL, STANDARD_MODULE_PROPERTIES + "DBase", dbase_functions, PHP_MINIT(dbase), PHP_MSHUTDOWN(dbase), NULL, NULL, NULL, STANDARD_MODULE_PROPERTIES }; Index: php4/ext/dbase/php_dbase.h diff -u php4/ext/dbase/php_dbase.h:1.2 php4/ext/dbase/php_dbase.h:1.3 --- php4/ext/dbase/php_dbase.h:1.2 Fri May 21 06:05:47 1999 +++ php4/ext/dbase/php_dbase.h Tue Jul 27 13:09:35 1999 @@ -27,7 +27,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_dbase.h,v 1.2 1999/05/21 10:05:47 sas Exp $ */ +/* $Id: php_dbase.h,v 1.3 1999/07/27 17:09:35 andrey Exp $ */ #ifndef _DBASE_H #define _DBASE_H @@ -35,7 +35,7 @@ extern php3_module_entry dbase_module_entry; #define dbase_module_ptr &dbase_module_entry -extern int php3_minit_dbase(INIT_FUNC_ARGS); +extern PHP_MINIT_FUNCTION(dbase); PHP_FUNCTION(dbase_open); PHP_FUNCTION(dbase_create); PHP_FUNCTION(dbase_close);