diff options
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/dba/dba.c | 21 | ||||
| -rw-r--r-- | ext/dbase/dbase.c | 3 | ||||
| -rw-r--r-- | ext/domxml/domxml.c | 2 | ||||
| -rw-r--r-- | ext/domxml/php_domxml.h | 8 | ||||
| -rw-r--r-- | ext/ftp/php_ftp.c | 20 | ||||
| -rw-r--r-- | ext/ftp/php_ftp.h | 12 |
6 files changed, 20 insertions, 46 deletions
diff --git a/ext/dba/dba.c b/ext/dba/dba.c index 56a5f3aa59..d448441e47 100644 --- a/ext/dba/dba.c +++ b/ext/dba/dba.c @@ -180,7 +180,6 @@ static void dba_close(dba_info *info) free(info); } /* }}} */ - /* {{{ php3_minit_dba */ static PHP_MINIT_FUNCTION(dba) { @@ -189,16 +188,12 @@ static PHP_MINIT_FUNCTION(dba) 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) { @@ -210,10 +205,8 @@ static PHP_MINFO_FUNCTION(dba) 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 @@ static void _php3_dba_update(INTERNAL_FUNCTION_PARAMETERS, int mode) 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 @@ static void _php3_dba_open(INTERNAL_FUNCTION_PARAMETERS, int persistent) 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 @@ PHP_FUNCTION(dba_popen) 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 @@ PHP_FUNCTION(dba_delete) 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 @@ PHP_FUNCTION(dba_insert) 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); } /* }}} */ diff --git a/ext/dbase/dbase.c b/ext/dbase/dbase.c index f3b8498d37..34fa80f80b 100644 --- a/ext/dbase/dbase.c +++ b/ext/dbase/dbase.c @@ -303,7 +303,8 @@ PHP_FUNCTION(dbase_add_record) { /* {{{ 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; diff --git a/ext/domxml/domxml.c b/ext/domxml/domxml.c index 684bb96292..fc6a53cfc2 100644 --- a/ext/domxml/domxml.c +++ b/ext/domxml/domxml.c @@ -70,7 +70,7 @@ static zend_function_entry php_domxmlattr_class_functions[] = { {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 }; diff --git a/ext/domxml/php_domxml.h b/ext/domxml/php_domxml.h index 4cc78fe5db..4153818172 100644 --- a/ext/domxml/php_domxml.h +++ b/ext/domxml/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_parent); 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 */ diff --git a/ext/ftp/php_ftp.c b/ext/ftp/php_ftp.c index 1b86f1f4cf..f96cc21a3c 100644 --- a/ext/ftp/php_ftp.c +++ b/ext/ftp/php_ftp.c @@ -34,12 +34,6 @@ #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 @@ function_entry php3_ftp_functions[] = { {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 @@ static void ftp_destructor_ftpbuf(ftpbuf_t *ftp) ftp_close(ftp); } -#ifndef ZEND_VERSION -int php3_minit_ftp(INIT_FUNC_ARGS) -#else PHP_MINIT_FUNCTION(ftp) -#endif { ELS_FETCH(); diff --git a/ext/ftp/php_ftp.h b/ext/ftp/php_ftp.h index fa978c4531..8e1a08ec83 100644 --- a/ext/ftp/php_ftp.h +++ b/ext/ftp/php_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_rename); 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 |