cvs: /php4/ext/imap imap.c imap.h /php4/ext/interbase interbase.c php3_interbase.h /php4/ext/ldap ldap.c php3_ldap.h /php4/ext/mcrypt mcrypt.c

andrey Mon Aug 2 11:02:52 1999 EDT Modified files: /php4/ext/imap imap.c imap.h /php4/ext/interbase interbase.c php3_interbase.h /php4/ext/ldap ldap.c php3_ldap.h /php4/ext/mcrypt mcrypt.c Log: More symbol work. Index: php4/ext/imap/imap.c diff -u php4/ext/imap/imap.c:1.9 php4/ext/imap/imap.c:1.10 --- php4/ext/imap/imap.c:1.9 Sat Jul 31 20:25:58 1999 +++ php4/ext/imap/imap.c Mon Aug 2 11:02:51 1999 @@ -21,7 +21,7 @@ | PHP 4.0 updates: Zeev Suraski <zeev@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: imap.c,v 1.9 1999/08/01 00:25:58 zeev Exp $ */ +/* $Id: imap.c,v 1.10 1999/08/02 15:02:51 andrey Exp $ */ #define IMAP41 @@ -147,7 +147,7 @@ php3_module_entry php3_imap_module_entry = { - IMAPVER, imap_functions, imap_init, NULL, NULL, NULL,imap_info, 0, 0, 0, NULL + IMAPVER, imap_functions, PHP_MINIT(imap), NULL, NULL, NULL,PHP_MINFO(imap), 0, 0, 0, NULL }; @@ -206,7 +206,7 @@ } -void imap_info(void) +PHP_MINFO_FUNCTION(imap) { php3_printf("Imap Support enabled<br>"); php3_printf("<table>"); @@ -219,7 +219,7 @@ php3_printf("</tr></table>"); } -int imap_init(INIT_FUNC_ARGS) +PHP_MINIT_FUNCTION(imap) { #if !(WIN32|WINNT) mail_link(&unixdriver); /* link in the unix driver */ Index: php4/ext/imap/imap.h diff -u php4/ext/imap/imap.h:1.3 php4/ext/imap/imap.h:1.4 --- php4/ext/imap/imap.h:1.3 Fri May 21 06:05:54 1999 +++ php4/ext/imap/imap.h Mon Aug 2 11:02:51 1999 @@ -16,8 +16,8 @@ extern php3_module_entry php3_imap_module_entry; #define php3_imap_module_ptr &php3_imap_module_entry -extern int imap_init(INIT_FUNC_ARGS); -void imap_info(void); +extern PHP_MINIT_FUNCTION(imap); +PHP_MINFO_FUNCTION(imap); PHP_FUNCTION(imap_open); PHP_FUNCTION(imap_reopen); PHP_FUNCTION(imap_close); Index: php4/ext/interbase/interbase.c diff -u php4/ext/interbase/interbase.c:1.5 php4/ext/interbase/interbase.c:1.6 --- php4/ext/interbase/interbase.c:1.5 Fri Jul 16 09:12:50 1999 +++ php4/ext/interbase/interbase.c Mon Aug 2 11:02:52 1999 @@ -16,12 +16,12 @@ +----------------------------------------------------------------------+ */ -/* $Id: interbase.c,v 1.5 1999/07/16 13:12:50 zeev Exp $ */ +/* $Id: interbase.c,v 1.6 1999/08/02 15:02:52 andrey Exp $ */ /* TODO: A lot... */ -#include "php_config.h" #include "php.h" +#include "php_config.h" #include "php3_interbase.h" #if HAVE_IBASE @@ -32,17 +32,17 @@ /* {{{ extension definition structures */ function_entry ibase_functions[] = { - {"ibase_connect", php3_ibase_connect, NULL}, - {"ibase_pconnect", php3_ibase_pconnect, NULL}, - {"ibase_close", php3_ibase_close, NULL}, - {"ibase_query", php3_ibase_query, NULL}, - {"ibase_fetch_row", php3_ibase_fetch_row, NULL}, - {"ibase_free_result", php3_ibase_free_result, NULL}, - {"ibase_prepare", php3_ibase_prepare, NULL}, - {"ibase_bind", php3_ibase_bind, NULL}, - {"ibase_execute", php3_ibase_execute, NULL}, - {"ibase_free_query", php3_ibase_free_query, NULL}, - {"ibase_timefmt", php3_ibase_timefmt, NULL}, + PHP_FE(ibase_connect, NULL) + PHP_FE(ibase_pconnect, NULL) + PHP_FE(ibase_close, NULL) + PHP_FE(ibase_query, NULL) + PHP_FE(ibase_fetch_row, NULL) + PHP_FE(ibase_free_result, NULL) + PHP_FE(ibase_prepare, NULL) + PHP_FE(ibase_bind, NULL) + PHP_FE(ibase_execute, NULL) + PHP_FE(ibase_free_query, NULL) + PHP_FE(ibase_timefmt, NULL) {NULL, NULL, NULL} }; @@ -50,11 +50,11 @@ { "InterBase", ibase_functions, - php3_minit_ibase, + PHP_MINIT(ibase), NULL, - php3_rinit_ibase, + PHP_RINIT(ibase), NULL, - php3_info_ibase, + PHP_MINFO(ibase), STANDARD_MODULE_PROPERTIES }; /* }}} */ @@ -144,7 +144,7 @@ /* }}} */ /* {{{ startup, shutdown and info functions */ -int php3_minit_ibase(INIT_FUNC_ARGS) +PHP_MINIT_FUNCTION(ibase) { IBASE_TLS_VARS; @@ -182,7 +182,7 @@ return SUCCESS; } -int php3_rinit_ibase(INIT_FUNC_ARGS) +PHP_RINIT_FUNCTION(ibase) { IBASE_TLS_VARS; @@ -202,7 +202,7 @@ } */ -void php3_info_ibase(ZEND_MODULE_INFO_FUNC_ARGS) +PHP_MINFO_FUNCTION(ibase) { /* TODO */ } Index: php4/ext/interbase/php3_interbase.h diff -u php4/ext/interbase/php3_interbase.h:1.3 php4/ext/interbase/php3_interbase.h:1.4 --- php4/ext/interbase/php3_interbase.h:1.3 Fri May 21 06:05:58 1999 +++ php4/ext/interbase/php3_interbase.h Mon Aug 2 11:02:52 1999 @@ -28,7 +28,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php3_interbase.h,v 1.3 1999/05/21 10:05:58 sas Exp $ */ +/* $Id: php3_interbase.h,v 1.4 1999/08/02 15:02:52 andrey Exp $ */ #ifndef _PHP3_IBASE_H #define _PHP3_IBASE_H @@ -44,10 +44,11 @@ extern php3_module_entry ibase_module_entry; #define php3_ibase_module_ptr &ibase_module_entry -extern int php3_minit_ibase(INIT_FUNC_ARGS); -extern int php3_rinit_ibase(INIT_FUNC_ARGS); -extern int php3_mfinish_ibase(void); -void php3_info_ibase(ZEND_MODULE_INFO_FUNC_ARGS); +extern PHP_MINIT_FUNCTION(ibase); +extern PHP_RINIT_FUNCTION(ibase); +extern PHP_MSHUTDOWN_FUNCTION(ibase); +PHP_MINFO_FUNCTION(ibase); + PHP_FUNCTION(ibase_connect); PHP_FUNCTION(ibase_pconnect); PHP_FUNCTION(ibase_close); Index: php4/ext/ldap/ldap.c diff -u php4/ext/ldap/ldap.c:1.9 php4/ext/ldap/ldap.c:1.10 --- php4/ext/ldap/ldap.c:1.9 Fri Jul 16 17:53:17 1999 +++ php4/ext/ldap/ldap.c Mon Aug 2 11:02:52 1999 @@ -20,7 +20,7 @@ */ -/* $Id: ldap.c,v 1.9 1999/07/16 21:53:17 zeev Exp $ */ +/* $Id: ldap.c,v 1.10 1999/08/02 15:02:52 andrey Exp $ */ #define IS_EXT_MODULE #include "php.h" @@ -66,39 +66,40 @@ */ function_entry ldap_functions[] = { - {"ldap_connect", php3_ldap_connect, NULL}, - {"ldap_close", php3_ldap_unbind, NULL}, - {"ldap_bind", php3_ldap_bind, NULL}, - {"ldap_unbind", php3_ldap_unbind, NULL}, - {"ldap_read", php3_ldap_read, NULL}, - {"ldap_list", php3_ldap_list, NULL}, - {"ldap_search", php3_ldap_search, NULL}, - {"ldap_free_result", php3_ldap_free_result, NULL}, - {"ldap_count_entries", php3_ldap_count_entries, NULL}, - {"ldap_first_entry", php3_ldap_first_entry, NULL}, - {"ldap_next_entry", php3_ldap_next_entry, NULL}, - {"ldap_get_entries", php3_ldap_get_entries, NULL}, - {"ldap_first_attribute", php3_ldap_first_attribute, NULL}, - {"ldap_next_attribute", php3_ldap_next_attribute, NULL}, - {"ldap_get_attributes", php3_ldap_get_attributes, NULL}, - {"ldap_get_values", php3_ldap_get_values, NULL}, - {"ldap_get_dn", php3_ldap_get_dn, NULL}, - {"ldap_explode_dn", php3_ldap_explode_dn, NULL}, - {"ldap_dn2ufn", php3_ldap_dn2ufn, NULL}, - {"ldap_add", php3_ldap_add, NULL}, - {"ldap_delete", php3_ldap_delete, NULL}, - {"ldap_modify", php3_ldap_modify, NULL}, + PHP_FE(ldap_connect, NULL) + PHP_FE(ldap_close, NULL) + PHP_FE(ldap_bind, NULL) + PHP_FE(ldap_unbind, NULL) + PHP_FE(ldap_read, NULL) + PHP_FE(ldap_list, NULL) + PHP_FE(ldap_search, NULL) + PHP_FE(ldap_free_result, NULL) + PHP_FE(ldap_count_entries, NULL) + PHP_FE(ldap_first_entry, NULL) + PHP_FE(ldap_next_entry, NULL) + PHP_FE(ldap_get_entries, NULL) + PHP_FE(ldap_first_attribute, NULL) + PHP_FE(ldap_next_attribute, NULL) + PHP_FE(ldap_get_attributes, NULL) + PHP_FE(ldap_get_values, NULL) + PHP_FE(ldap_get_dn, NULL) + PHP_FE(ldap_explode_dn, NULL) + PHP_FE(ldap_dn2ufn, NULL) + PHP_FE(ldap_add, NULL) + PHP_FE(ldap_delete, NULL) + PHP_FE(ldap_modify, NULL) /* additional functions for attribute based modifications, Gerrit Thomson */ - {"ldap_mod_add", php3_ldap_mod_add, NULL}, - {"ldap_mod_replace", php3_ldap_mod_replace, NULL}, - {"ldap_mod_del", php3_ldap_mod_del, NULL}, + PHP_FE(ldap_mod_add, NULL) + PHP_FE(ldap_mod_replace, NULL) + PHP_FE(ldap_mod_del, NULL) /* end gjt mod */ {NULL, NULL, NULL} }; php3_module_entry ldap_module_entry = { - "LDAP", ldap_functions, php3_minit_ldap, php3_mshutdown_ldap, NULL, NULL, php3_info_ldap, STANDARD_MODULE_PROPERTIES + "LDAP", ldap_functions, PHP_MINIT(ldap), PHP_MSHUTDOWN(ldap), NULL, NULL, + PHP_MINFO(ldap), STANDARD_MODULE_PROPERTIES }; @@ -170,7 +171,7 @@ ldap_msgfree(result); } -int php3_minit_ldap(INIT_FUNC_ARGS) +PHP_MINIT_FUNCTION(ldap) { #if defined(THREAD_SAFE) ldap_module *php3_ldap_module; @@ -240,7 +241,8 @@ return SUCCESS; } -int php3_mshutdown_ldap(SHUTDOWN_FUNC_ARGS) { +PHP_MSHUTDOWN_FUNCTION(ldap) +{ #ifdef THREAD_SAFE LDAP_TLS_VARS; PHP3_TLS_THREAD_FREE(php3_ldap_module); @@ -255,7 +257,7 @@ return SUCCESS; } -void php3_info_ldap(ZEND_MODULE_INFO_FUNC_ARGS) +PHP_MINFO_FUNCTION(ldap) { char maxl[16]; #if HAVE_NSLDAP @@ -275,7 +277,7 @@ php3_printf("<table>" "<tr><td>Total links:</td><td>%d/%s</td></tr>\n" - "<tr><td>RCS Version:</td><td>$Id: ldap.c,v 1.9 1999/07/16 21:53:17 zeev Exp $</td></tr>\n" + "<tr><td>RCS Version:</td><td>$Id: ldap.c,v 1.10 1999/08/02 15:02:52 andrey Exp $</td></tr>\n" #if HAVE_NSLDAP "<tr><td>SDK Version:</td><td>%f</td></tr>" "<tr><td>Highest LDAP Protocol Supported:</td><td>%f</td></tr>" Index: php4/ext/ldap/php3_ldap.h diff -u php4/ext/ldap/php3_ldap.h:1.4 php4/ext/ldap/php3_ldap.h:1.5 --- php4/ext/ldap/php3_ldap.h:1.4 Sat May 22 12:12:07 1999 +++ php4/ext/ldap/php3_ldap.h Mon Aug 2 11:02:52 1999 @@ -29,7 +29,7 @@ */ -/* $Id: php3_ldap.h,v 1.4 1999/05/22 16:12:07 sas Exp $ */ +/* $Id: php3_ldap.h,v 1.5 1999/08/02 15:02:52 andrey Exp $ */ #ifndef _PHP3_LDAP_H #define _PHP3_LDAP_H @@ -47,10 +47,10 @@ #define ldap_module_ptr &ldap_module_entry /* LDAP functions */ -int php3_minit_ldap(INIT_FUNC_ARGS); -int php3_mshutdown_ldap(SHUTDOWN_FUNC_ARGS); +PHP_MINIT_FUNCTION(ldap); +PHP_MSHUTDOWN_FUNCTION(ldap); -void php3_info_ldap(ZEND_MODULE_INFO_FUNC_ARGS); +PHP_MINFO_FUNCTION(ldap); PHP_FUNCTION(ldap_connect); Index: php4/ext/mcrypt/mcrypt.c diff -u php4/ext/mcrypt/mcrypt.c:1.17 php4/ext/mcrypt/mcrypt.c:1.18 --- php4/ext/mcrypt/mcrypt.c:1.17 Fri Jul 16 09:12:50 1999 +++ php4/ext/mcrypt/mcrypt.c Mon Aug 2 11:02:52 1999 @@ -39,12 +39,12 @@ {0}, }; -static int php_minit_mcrypt(INIT_FUNC_ARGS); +static PHP_MINIT_FUNCTION(mcrypt); zend_module_entry mcrypt_module_entry = { "mcrypt", mcrypt_functions, - php_minit_mcrypt, NULL, + PHP_MINIT(mcrypt), NULL, NULL, NULL, NULL, STANDARD_MODULE_PROPERTIES, @@ -110,7 +110,7 @@ #define MCRYPT_ENTRY(a) REGISTER_LONG_CONSTANT("MCRYPT_" #a, a, CONST_PERSISTENT) -static int php_minit_mcrypt(INIT_FUNC_ARGS) +static PHP_MINIT_FUNCTION(mcrypt) { /* modes for mcrypt_??? routines */ REGISTER_LONG_CONSTANT("MCRYPT_ENCRYPT", 0, CONST_PERSISTENT);