[PHP-CVS] cvs: php4 /ext/fam fam.c
andrey Sun Jun 15 11:27:45 2003 EDT
Modified files:
/php4/ext/fam fam.c
Log:
proto fixes
Index: php4/ext/fam/fam.c
diff -u php4/ext/fam/fam.c:1.4 php4/ext/fam/fam.c:1.5
--- php4/ext/fam/fam.c:1.4 Tue Jun 10 16:03:28 2003
+++ php4/ext/fam/fam.c Sun Jun 15 11:27:45 2003
@@ -15,7 +15,7 @@
| Author: Sascha Schumann [EMAIL PROTECTED] |
+--+
- $Id: fam.c,v 1.4 2003/06/10 20:03:28 imajes Exp $
+ $Id: fam.c,v 1.5 2003/06/15 15:27:45 andrey Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -182,7 +182,7 @@
/* }}} */
-/* {{{ proto int fam_open([string appname])
+/* {{{ proto resource fam_open([string appname])
*/
PHP_FUNCTION(fam_open)
{
@@ -207,7 +207,7 @@
}
/* }}} */
-/* {{{ proto boolean fam_close(resource id)
+/* {{{ proto void fam_close(resource id)
*/
PHP_FUNCTION(fam_close)
{
@@ -221,7 +221,7 @@
}
/* }}} */
-/* {{{ proto int fam_monitor_directory(resource id, string dirname)
+/* {{{ proto resource fam_monitor_directory(resource id, string dirname)
*/
PHP_FUNCTION(fam_monitor_directory)
{
@@ -249,7 +249,7 @@
}
/* }}} */
-/* {{{ proto int fam_monitor_file(resource id, string filename)
+/* {{{ proto resource fam_monitor_file(resource id, string filename)
*/
PHP_FUNCTION(fam_monitor_file)
{
@@ -277,7 +277,7 @@
}
/* }}} */
-/* {{{ proto int fam_monitor_collection(resource id, string dirname, int depth,
string mask)
+/* {{{ proto resource fam_monitor_collection(resource id, string dirname, int depth,
string mask)
*/
PHP_FUNCTION(fam_monitor_collection)
{
@@ -309,7 +309,7 @@
}
/* }}} */
-/* {{{ proto boolean fam_suspend_monitor(resource id, resource monitor_id)
+/* {{{ proto bool fam_suspend_monitor(resource id, resource monitor_id)
*/
PHP_FUNCTION(fam_suspend_monitor)
{
@@ -333,7 +333,7 @@
}
/* }}} */
-/* {{{ proto boolean fam_resume_monitor(resource id, resource monitor_id)
+/* {{{ proto bool fam_resume_monitor(resource id, resource monitor_id)
*/
PHP_FUNCTION(fam_resume_monitor)
{
@@ -358,7 +358,7 @@
}
/* }}} */
-/* {{{ proto boolean fam_cancel_monitor(resource id, resource monitor_id)
+/* {{{ proto bool fam_cancel_monitor(resource id, resource monitor_id)
*/
PHP_FUNCTION(fam_cancel_monitor)
{
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php4 /ext/fam fam.c /ext/fbsql php_fbsql.c /ext/hwapi hwapi.cpp /ext/hyperwave hw.c /ext/informix ifx.ec /ext/ingres_iiii.c /ext/interbase interbase.c /ext/ircg ircg.c /ext
Work for both PHP 4 and PHP 5? You kinda like test the API number..this is not the only difference between them.. --Jani On Fri, 7 Mar 2003, Derick Rethans wrote: On Fri, 7 Mar 2003, Jani Taskinen wrote: Log: Renamed OnUpdateInt - OnUpdateLong to prevent further misunderstandings. # Intentionally left out any 'alias' for it, this way 3rd party extension # maintainers will really NOTICE the change. How can we test in 3rd party extensions for this whether to use the first (OnUpdateInt) or the second (OnUpdateLong)? THis is quite important for external extensions which need to work for both flavors. Derick -- - For Sale! - -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php4 /ext/fam fam.c /ext/fbsql php_fbsql.c /ext/hwapi hwapi.cpp /ext/hyperwave hw.c /ext/informix ifx.ec /ext/ingres_iiii.c /ext/interbase interbase.c /ext/ircg ircg.c /ext
On Fri, 7 Mar 2003, Jani Taskinen wrote: Work for both PHP 4 and PHP 5? Ok, I thought it was merged to the branch, but it wasn't it seems... nm then. Derick -- Stop mad cowboy disease! - Derick Rethans http://derickrethans.nl/ PHP Magazine - PHP Magazine for Professionals http://php-mag.net/ - -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php4 /ext/fam fam.c /ext/fbsql php_fbsql.c /ext/hwapi hwapi.cpp /ext/hyperwave hw.c /ext/informix ifx.ec /ext/ingres_iiii.c /ext/interbase interbase.c /ext/ircg ircg.c /ext
On Fri, 7 Mar 2003, Sascha Schumann wrote: Work for both PHP 4 and PHP 5? Ok, I thought it was merged to the branch, but it wasn't it seems... nm then. nm.. which file? httpd? apache? libphp4.so? Or .sl? Or .a? hehe, I mean Never Mind with nm :) Please bump the API number. I still agree with that though. Derick -- Stop mad cowboy disease! - Derick Rethans http://derickrethans.nl/ PHP Magazine - PHP Magazine for Professionals http://php-mag.net/ - -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php4 /ext/fam fam.c /ext/fbsql php_fbsql.c /ext/hwapi hwapi.cpp /ext/hyperwave hw.c /ext/informix ifx.ec /ext/ingres_iiii.c /ext/interbase interbase.c /ext/ircg ircg.c /ext
Work for both PHP 4 and PHP 5? Ok, I thought it was merged to the branch, but it wasn't it seems... nm then. nm.. which file? httpd? apache? libphp4.so? Or .sl? Or .a? Please bump the API number. - Sascha -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php4 /ext/fam fam.c /ext/fbsql php_fbsql.c /ext/hwapi hwapi.cpp /ext/hyperwave hw.c /ext/informix ifx.ec /ext/ingres_iiii.c /ext/interbase interbase.c /ext/ircg ircg.c /ext
On Fri, 7 Mar 2003, Sascha Schumann wrote: Work for both PHP 4 and PHP 5? Ok, I thought it was merged to the branch, but it wasn't it seems... nm then. nm.. which file? httpd? apache? libphp4.so? Or .sl? Or .a? Please bump the API number. Which one(s) ? We have 3 of them.. And two of those are still same in php5 and php4 (PHP_4_3 branch). --Jani -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php4 /ext/fam fam.c /ext/fbsql php_fbsql.c /ext/hwapi hwapi.cpp /ext/hyperwave hw.c /ext/informix ifx.ec /ext/ingres_iiii.c /ext/interbase interbase.c /ext/ircg ircg.c /ext
Which one(s) ? We have 3 of them.. A Zend API change should be reflected by the a bump in the Zend API version number, ZEND_EXTENSION_API_NO. - Sascha -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/fam fam.c /ext/fbsql php_fbsql.c /ext/hwapi hwapi.cpp /ext/hyperwave hw.c /ext/informix ifx.ec /ext/ingres_ii ii.c /ext/interbase interbase.c /ext/ircg ircg.c /ext/ldap ldap.c /ext/mbstring mbstring.c /ext/mssql php_mssql.c /ext/mysql php_mysql.c /ext/mysqli mysqli.c /ext/ncurses ncurses.c /ext/odbc php_odbc.c /ext/pfpro pfpro.c /ext/pgsql pgsql.c /ext/session session.c /ext/skeleton skeleton.c /ext/standard assert.c file.c /ext/sybase_ct php_sybase_ct.c /ext/sysvmsg sysvmsg.c /ext/tokenizer tokenizer.c /ext/yaz php_yaz.c /ext/zlib zlib.c /main main.c /netware phplib.imp /sapi/apache php_apache.c /sapi/apache_hooks php_apache.c /scripts/ext_skel_ng extension_parser.php ZendEngine2 zend_ini.c zend_ini.h
sniper Fri Mar 7 00:15:29 2003 EDT
Modified files:
/ZendEngine2zend_ini.c zend_ini.h
/php4/ext/fam fam.c
/php4/ext/fbsql php_fbsql.c
/php4/ext/hwapi hwapi.cpp
/php4/ext/hyperwave hw.c
/php4/ext/informix ifx.ec
/php4/ext/ingres_ii ii.c
/php4/ext/interbase interbase.c
/php4/ext/ircg ircg.c
/php4/ext/ldap ldap.c
/php4/ext/mbstring mbstring.c
/php4/ext/mssql php_mssql.c
/php4/ext/mysql php_mysql.c
/php4/ext/mysqlimysqli.c
/php4/ext/ncurses ncurses.c
/php4/ext/odbc php_odbc.c
/php4/ext/pfpro pfpro.c
/php4/ext/pgsql pgsql.c
/php4/ext/session session.c
/php4/ext/skeleton skeleton.c
/php4/ext/standard assert.c file.c
/php4/ext/sybase_ct php_sybase_ct.c
/php4/ext/sysvmsg sysvmsg.c
/php4/ext/tokenizer tokenizer.c
/php4/ext/yaz php_yaz.c
/php4/ext/zlib zlib.c
/php4/main main.c
/php4/netware phplib.imp
/php4/sapi/apache php_apache.c
/php4/sapi/apache_hooks php_apache.c
/php4/scripts/ext_skel_ng extension_parser.php
Log:
Renamed OnUpdateInt - OnUpdateLong to prevent further misunderstandings.
# Intentionally left out any 'alias' for it, this way 3rd party extension
# maintainers will really NOTICE the change.
Index: ZendEngine2/zend_ini.c
diff -u ZendEngine2/zend_ini.c:1.28 ZendEngine2/zend_ini.c:1.29
--- ZendEngine2/zend_ini.c:1.28 Fri Jan 31 20:49:14 2003
+++ ZendEngine2/zend_ini.c Fri Mar 7 00:15:08 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: zend_ini.c,v 1.28 2003/02/01 01:49:14 sniper Exp $ */
+/* $Id: zend_ini.c,v 1.29 2003/03/07 05:15:08 sniper Exp $ */
#include zend.h
#include zend_qsort.h
@@ -436,7 +436,7 @@
}
-ZEND_API ZEND_INI_MH(OnUpdateInt)
+ZEND_API ZEND_INI_MH(OnUpdateLong)
{
long *p;
#ifndef ZTS
Index: ZendEngine2/zend_ini.h
diff -u ZendEngine2/zend_ini.h:1.26 ZendEngine2/zend_ini.h:1.27
--- ZendEngine2/zend_ini.h:1.26 Fri Jan 31 20:49:14 2003
+++ ZendEngine2/zend_ini.h Fri Mar 7 00:15:08 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: zend_ini.h,v 1.26 2003/02/01 01:49:14 sniper Exp $ */
+/* $Id: zend_ini.h,v 1.27 2003/03/07 05:15:08 sniper Exp $ */
#ifndef ZEND_INI_H
#define ZEND_INI_H
@@ -172,7 +172,7 @@
/* Standard message handlers */
ZEND_API ZEND_INI_MH(OnUpdateBool);
-ZEND_API ZEND_INI_MH(OnUpdateInt);
+ZEND_API ZEND_INI_MH(OnUpdateLong);
ZEND_API ZEND_INI_MH(OnUpdateReal);
ZEND_API ZEND_INI_MH(OnUpdateString);
ZEND_API ZEND_INI_MH(OnUpdateStringUnempty);
Index: php4/ext/fam/fam.c
diff -u php4/ext/fam/fam.c:1.2 php4/ext/fam/fam.c:1.3
--- php4/ext/fam/fam.c:1.2 Tue Dec 31 11:06:34 2002
+++ php4/ext/fam/fam.c Fri Mar 7 00:15:09 2003
@@ -15,7 +15,7 @@
| Author: Sascha Schumann [EMAIL PROTECTED] |
+--+
- $Id: fam.c,v 1.2 2002/12/31 16:06:34 sebastian Exp $
+ $Id: fam.c,v 1.3 2003/03/07 05:15:09 sniper Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -83,7 +83,7 @@
*/
/* Remove comments and fill if you need to have entries in php.ini
PHP_INI_BEGIN()
-STD_PHP_INI_ENTRY(fam.global_value, 42, PHP_INI_ALL, OnUpdateInt,
global_value, zend_fam_globals, fam_globals)
+STD_PHP_INI_ENTRY(fam.global_value, 42, PHP_INI_ALL, OnUpdateLong,
global_value, zend_fam_globals, fam_globals)
STD_PHP_INI_ENTRY(fam.global_string, foobar, PHP_INI_ALL, OnUpdateString,
global_string, zend_fam_globals, fam_globals)
PHP_INI_END()
*/
Index: php4/ext/fbsql/php_fbsql.c
diff -u php4/ext/fbsql/php_fbsql.c:1.94 php4/ext/fbsql/php_fbsql.c:1.95
--- php4/ext/fbsql/php_fbsql.c:1.94 Thu Mar 6 15:31:15 2003
+++ php4/ext/fbsql/php_fbsql.c Fri Mar 7 00:15:09 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_fbsql.c,v 1.94 2003/03/06 20:31:15 sesser Exp $ */
+/* $Id: php_fbsql.c,v 1.95 2003/03/07 05:15:09 sniper Exp $ */
/* TODO:
*
@@ -358,14 +358,14 @@
/* {{{ PHP_INI
*/
PHP_INI_BEGIN()
- STD_PHP_INI_BOOLEAN (fbsql.allow_persistent, 1,
PHP_INI_SYSTEM, OnUpdateInt,allowPersistent, zend_fbsql_globals,
fbsql_globals)
- STD_PHP_INI_BOOLEAN (fbsql.generate_warnings,0,
PHP_INI_SYSTEM, OnUpdateInt,generateWarnings, zend_fbsql_globals,
fbsql_globals)
- STD_PHP_INI_BOOLEAN (fbsql.autocommit,
1,PHP_INI_SYSTEM, OnUpdateInt,autoCommit,
zend_fbsql_globals, fbsql_globals)
- STD_PHP_INI_ENTRY_EX (fbsql.max_persistent, -1,
PHP_INI_SYSTEM, OnUpdateInt,maxPersistent,
Re: [PHP-CVS] cvs: php4 /ext/fam fam.c /ext/fbsql php_fbsql.c /ext/hwapi hwapi.cpp /ext/hyperwave hw.c /ext/informix ifx.ec /ext/ingres_iiii.c /ext/interbase interbase.c /ext/ircg ircg.c /ext/lda
On Fri, 7 Mar 2003, Jani Taskinen wrote: Log: Renamed OnUpdateInt - OnUpdateLong to prevent further misunderstandings. # Intentionally left out any 'alias' for it, this way 3rd party extension # maintainers will really NOTICE the change. How can we test in 3rd party extensions for this whether to use the first (OnUpdateInt) or the second (OnUpdateLong)? THis is quite important for external extensions which need to work for both flavors. Derick -- Stop mad cowboy disease! - Derick Rethans http://derickrethans.nl/ PHP Magazine - PHP Magazine for Professionals http://php-mag.net/ - -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
