cvs: /php4/ext/dba dba.c /php4/ext/dbase dbase.c /php4/ext/domxml domxml.c php_domxml.h /php4/ext/ftp php_ftp.c php_ftp.h

zeev Fri Dec 17 16:34:28 1999 EDT Modified files: /php4/ext/dba dba.c /php4/ext/dbase dbase.c /php4/ext/domxml domxml.c php_domxml.h /php4/ext/ftp php_ftp.c php_ftp.h Log: More php3 cleanup Index: php4/ext/dba/dba.c diff -u php4/ext/dba/dba.c:1.9 php4/ext/dba/dba.c:1.10 --- php4/ext/dba/dba.c:1.9 Fri Dec 17 15:54:51 1999 +++ php4/ext/dba/dba.c Fri Dec 17 16:34:23 1999 @@ -27,7 +27,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dba.c,v 1.9 1999/12/17 20:54:51 zeev Exp $ */ +/* $Id: dba.c,v 1.10 1999/12/17 21:34:23 zeev Exp $ */ #include "php.h" @@ -180,7 +180,6 @@ free(info); } /* }}} */ - /* {{{ php3_minit_dba */ static PHP_MINIT_FUNCTION(dba) { @@ -189,31 +188,25 @@ GLOBAL(le_pdb) = register_list_destructors(NULL, dba_close); return SUCCESS; } -/* }}} */ - /* {{{ php3_mshutdown_dba */ static PHP_MSHUTDOWN_FUNCTION(dba) { zend_hash_destroy(&ht_keys); return SUCCESS; } -/* }}} */ - /* {{{ php3_info_dba */ static PHP_MINFO_FUNCTION(dba) { dba_handler *hptr; - PUTS("V1 ($Id: dba.c,v 1.9 1999/12/17 20:54:51 zeev Exp $)"); + PUTS("V1 ($Id: dba.c,v 1.10 1999/12/17 21:34:23 zeev Exp $)"); for(hptr = handler; hptr->name; hptr++) { PUTS(" "); PUTS(hptr->name); } } -/* }}} */ - /* {{{ _php3_dba_update */ -static void _php3_dba_update(INTERNAL_FUNCTION_PARAMETERS, int mode) +static void php_dba_update(INTERNAL_FUNCTION_PARAMETERS, int mode) { DBA_ID_PARS; pval **val, **key; @@ -231,12 +224,10 @@ RETURN_TRUE; RETURN_FALSE; } -/* }}} */ - /* {{{ _php3_dba_open */ #define FREENOW if(args) efree(args); if(key) efree(key) -static void _php3_dba_open(INTERNAL_FUNCTION_PARAMETERS, int persistent) +static void php_dba_open(INTERNAL_FUNCTION_PARAMETERS, int persistent) { pval ***args = (pval ***) NULL; int ac = ARG_COUNT(ht); @@ -343,7 +334,7 @@ opens path using the specified handler in mode persistently */ PHP_FUNCTION(dba_popen) { - _php3_dba_open(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1); + php_dba_open(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1); } /* }}} */ @@ -351,7 +342,7 @@ opens path using the specified handler in mode*/ PHP_FUNCTION(dba_open) { - _php3_dba_open(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); + php_dba_open(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); } /* }}} */ @@ -441,7 +432,7 @@ inserts value as key, returns false, if key exists already */ PHP_FUNCTION(dba_insert) { - _php3_dba_update(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1); + php_dba_update(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1); } /* }}} */ @@ -449,7 +440,7 @@ inserts value as key, replaces key, if key exists already */ PHP_FUNCTION(dba_replace) { - _php3_dba_update(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); + php_dba_update(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); } /* }}} */ Index: php4/ext/dbase/dbase.c diff -u php4/ext/dbase/dbase.c:1.14 php4/ext/dbase/dbase.c:1.15 --- php4/ext/dbase/dbase.c:1.14 Fri Dec 17 15:54:52 1999 +++ php4/ext/dbase/dbase.c Fri Dec 17 16:34:24 1999 @@ -303,7 +303,8 @@ /* {{{ proto bool dbase_replace_record(int identifier, array data, int recnum) Replaces a record to the database */ -void php3_dbase_replace_record(INTERNAL_FUNCTION_PARAMETERS) { +PHP_FUNCTION(dbase_replace_record) +{ pval *dbh_id, *fields, *field, *recnum; dbhead_t *dbh; int dbh_type; Index: php4/ext/domxml/domxml.c diff -u php4/ext/domxml/domxml.c:1.5 php4/ext/domxml/domxml.c:1.6 --- php4/ext/domxml/domxml.c:1.5 Fri Dec 17 15:54:53 1999 +++ php4/ext/domxml/domxml.c Fri Dec 17 16:34:25 1999 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: domxml.c,v 1.5 1999/12/17 20:54:53 zeev Exp $ */ +/* $Id: domxml.c,v 1.6 1999/12/17 21:34:25 zeev Exp $ */ #include "php.h" @@ -70,7 +70,7 @@ {NULL, NULL, NULL} }; -zend_module_entry php3_domxml_module_entry = { +zend_module_entry php_domxml_module_entry = { "DOM", php_domxml_functions, PHP_MINIT(domxml), NULL, NULL, NULL, PHP_MINFO(domxml), STANDARD_MODULE_PROPERTIES }; Index: php4/ext/domxml/php_domxml.h diff -u php4/ext/domxml/php_domxml.h:1.2 php4/ext/domxml/php_domxml.h:1.3 --- php4/ext/domxml/php_domxml.h:1.2 Fri Dec 17 15:54:53 1999 +++ php4/ext/domxml/php_domxml.h Fri Dec 17 16:34:25 1999 @@ -29,7 +29,7 @@ */ -/* $Id: php_domxml.h,v 1.2 1999/12/17 20:54:53 zeev Exp $ */ +/* $Id: php_domxml.h,v 1.3 1999/12/17 21:34:25 zeev Exp $ */ #ifndef _PHP_DOMXML_H #define _PHP_DOMXML_H @@ -37,8 +37,8 @@ #if HAVE_DOMXML #include <gnome-xml/parser.h> -extern zend_module_entry php3_domxml_module_entry; -#define php3_domxml_module_ptr &php3_domxml_module_entry +extern zend_module_entry php_domxml_module_entry; +#define php_domxml_module_ptr &php_domxml_module_entry /* directory functions */ extern PHP_MINIT_FUNCTION(domxml); @@ -61,8 +61,8 @@ PHP_FUNCTION(domxml_attrname); #else -#define php3_domxml_module_ptr NULL +#define php_domxml_module_ptr NULL #endif /* HAVE_DOMXML */ -#define phpext_domxml_ptr php3_domxml_module_ptr +#define phpext_domxml_ptr php_domxml_module_ptr #endif /* _PHP3_DIR_H */ Index: php4/ext/ftp/php_ftp.c diff -u php4/ext/ftp/php_ftp.c:1.12 php4/ext/ftp/php_ftp.c:1.13 --- php4/ext/ftp/php_ftp.c:1.12 Fri Dec 17 15:54:57 1999 +++ php4/ext/ftp/php_ftp.c Fri Dec 17 16:34:26 1999 @@ -28,18 +28,12 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_ftp.c,v 1.12 1999/12/17 20:54:57 zeev Exp $ */ +/* $Id: php_ftp.c,v 1.13 1999/12/17 21:34:26 zeev Exp $ */ #include "php.h" #if HAVE_FTP -#ifndef ZEND_VERSION -#include "internal_functions.h" -#include "php3_list.h" -#define php_error php_error -#endif - #include "ext/standard/file.h" #include "php_ftp.h" @@ -48,7 +42,7 @@ static int le_ftpbuf; -function_entry php3_ftp_functions[] = { +function_entry php_ftp_functions[] = { PHP_FE(ftp_connect, NULL) PHP_FE(ftp_login, NULL) PHP_FE(ftp_pwd, NULL) @@ -72,14 +66,10 @@ {NULL, NULL, NULL} }; -zend_module_entry php3_ftp_module_entry = { +zend_module_entry php_ftp_module_entry = { "FTP Functions", - php3_ftp_functions, -#ifdef ZEND_VERSION + php_ftp_functions, PHP_MINIT(ftp), -#else - php3_minit_ftp, -#endif NULL, NULL, NULL, @@ -92,11 +82,7 @@ ftp_close(ftp); } -#ifndef ZEND_VERSION -int php3_minit_ftp(INIT_FUNC_ARGS) -#else PHP_MINIT_FUNCTION(ftp) -#endif { ELS_FETCH(); Index: php4/ext/ftp/php_ftp.h diff -u php4/ext/ftp/php_ftp.h:1.7 php4/ext/ftp/php_ftp.h:1.8 --- php4/ext/ftp/php_ftp.h:1.7 Fri Dec 17 15:54:57 1999 +++ php4/ext/ftp/php_ftp.h Fri Dec 17 16:34:26 1999 @@ -28,7 +28,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_ftp.h,v 1.7 1999/12/17 20:54:57 zeev Exp $ */ +/* $Id: php_ftp.h,v 1.8 1999/12/17 21:34:26 zeev Exp $ */ #ifndef _INCLUDED_FTP_H #define _INCLUDED_FTP_H @@ -40,14 +40,10 @@ #if HAVE_FTP -extern zend_module_entry php3_ftp_module_entry; -#define php3_ftp_module_ptr &php3_ftp_module_entry +extern zend_module_entry php_ftp_module_entry; +#define php_ftp_module_ptr &php_ftp_module_entry -#ifdef ZEND_VERSION PHP_MINIT_FUNCTION(ftp); -#else -int php3_minit_ftp(INIT_FUNC_ARGS); -#endif PHP_FUNCTION(ftp_connect); PHP_FUNCTION(ftp_login); @@ -70,10 +66,10 @@ PHP_FUNCTION(ftp_delete); PHP_FUNCTION(ftp_quit); -#define phpext_ftp_ptr php3_ftp_module_ptr +#define phpext_ftp_ptr php_ftp_module_ptr #else -#define php3_ftp_module_ptr NULL +#define php_ftp_module_ptr NULL #endif /* HAVE_FTP */ #endif