rasmus Mon Feb 7 18:03:50 2005 EDT
Modified files:
/php-src/ext/fam fam.c php_fam.h
/php-src/ext/hwapi hwapi.cpp php_hwapi.h
/php-src/ext/mono php_mono.c
/php-src/ext/msession msession.c php_msession.h
/php-src/ext/ncurses ncurses.c php_ncurses.h
/php-src/ext/tidy php_tidy.h tidy.c
Log:
Get rid of more useless RINIT/RSHUTDOWN calls
http://cvs.php.net/diff.php/php-src/ext/fam/fam.c?r1=1.8&r2=1.9&ty=u
Index: php-src/ext/fam/fam.c
diff -u php-src/ext/fam/fam.c:1.8 php-src/ext/fam/fam.c:1.9
--- php-src/ext/fam/fam.c:1.8 Thu May 20 13:03:24 2004
+++ php-src/ext/fam/fam.c Mon Feb 7 18:03:46 2005
@@ -15,7 +15,7 @@
| Author: Sascha Schumann <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: fam.c,v 1.8 2004/05/20 17:03:24 derick Exp $
+ $Id: fam.c,v 1.9 2005/02/07 23:03:46 rasmus Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -64,9 +64,9 @@
"fam",
fam_functions,
PHP_MINIT(fam),
- PHP_MSHUTDOWN(fam),
- PHP_RINIT(fam), /* Replace with NULL if there's nothing to do
at request start */
- PHP_RSHUTDOWN(fam), /* Replace with NULL if there's nothing to do
at request end */
+ NULL,
+ NULL,
+ NULL,
PHP_MINFO(fam),
#if ZEND_MODULE_API_NO >= 20010901
"0.1", /* Replace with version number for your extension */
@@ -128,35 +128,6 @@
}
/* }}} */
-/* {{{ PHP_MSHUTDOWN_FUNCTION
- */
-PHP_MSHUTDOWN_FUNCTION(fam)
-{
- /* uncomment this line if you have INI entries
- UNREGISTER_INI_ENTRIES();
- */
- return SUCCESS;
-}
-/* }}} */
-
-/* Remove if there's nothing to do at request start */
-/* {{{ PHP_RINIT_FUNCTION
- */
-PHP_RINIT_FUNCTION(fam)
-{
- return SUCCESS;
-}
-/* }}} */
-
-/* Remove if there's nothing to do at request end */
-/* {{{ PHP_RSHUTDOWN_FUNCTION
- */
-PHP_RSHUTDOWN_FUNCTION(fam)
-{
- return SUCCESS;
-}
-/* }}} */
-
/* {{{ PHP_MINFO_FUNCTION
*/
PHP_MINFO_FUNCTION(fam)
http://cvs.php.net/diff.php/php-src/ext/fam/php_fam.h?r1=1.4&r2=1.5&ty=u
Index: php-src/ext/fam/php_fam.h
diff -u php-src/ext/fam/php_fam.h:1.4 php-src/ext/fam/php_fam.h:1.5
--- php-src/ext/fam/php_fam.h:1.4 Thu Jan 8 12:32:05 2004
+++ php-src/ext/fam/php_fam.h Mon Feb 7 18:03:46 2005
@@ -15,7 +15,7 @@
| Author: |
+----------------------------------------------------------------------+
- $Id: php_fam.h,v 1.4 2004/01/08 17:32:05 sniper Exp $
+ $Id: php_fam.h,v 1.5 2005/02/07 23:03:46 rasmus Exp $
*/
#ifndef PHP_FAM_H
@@ -35,9 +35,6 @@
#endif
PHP_MINIT_FUNCTION(fam);
-PHP_MSHUTDOWN_FUNCTION(fam);
-PHP_RINIT_FUNCTION(fam);
-PHP_RSHUTDOWN_FUNCTION(fam);
PHP_MINFO_FUNCTION(fam);
PHP_FUNCTION(fam_open);
http://cvs.php.net/diff.php/php-src/ext/hwapi/hwapi.cpp?r1=1.10&r2=1.11&ty=u
Index: php-src/ext/hwapi/hwapi.cpp
diff -u php-src/ext/hwapi/hwapi.cpp:1.10 php-src/ext/hwapi/hwapi.cpp:1.11
--- php-src/ext/hwapi/hwapi.cpp:1.10 Sun Jun 15 12:04:26 2003
+++ php-src/ext/hwapi/hwapi.cpp Mon Feb 7 18:03:47 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: hwapi.cpp,v 1.10 2003/06/15 16:04:26 andrey Exp $ */
+/* $Id: hwapi.cpp,v 1.11 2005/02/07 23:03:47 rasmus Exp $ */
#include <stdlib.h>
#include <errno.h>
@@ -202,8 +202,8 @@
"hwapi",
hwapi_functions,
PHP_MINIT(hwapi),
- PHP_MSHUTDOWN(hwapi),
- PHP_RINIT(hwapi),
+ NULL,
+ NULL,
NULL,
PHP_MINFO(hwapi),
NO_VERSION_YET,
@@ -2224,14 +2224,6 @@
return SUCCESS;
}
-PHP_MSHUTDOWN_FUNCTION(hwapi) {
- return SUCCESS;
-}
-
-PHP_RINIT_FUNCTION(hwapi) {
- return SUCCESS;
-}
-
PHP_MINFO_FUNCTION(hwapi) {
php_info_print_table_start();
php_info_print_table_row(2, "Hyperwave API Support", "enabled");
http://cvs.php.net/diff.php/php-src/ext/hwapi/php_hwapi.h?r1=1.2&r2=1.3&ty=u
Index: php-src/ext/hwapi/php_hwapi.h
diff -u php-src/ext/hwapi/php_hwapi.h:1.2 php-src/ext/hwapi/php_hwapi.h:1.3
--- php-src/ext/hwapi/php_hwapi.h:1.2 Tue Jun 10 16:03:29 2003
+++ php-src/ext/hwapi/php_hwapi.h Mon Feb 7 18:03:48 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_hwapi.h,v 1.2 2003/06/10 20:03:29 imajes Exp $ */
+/* $Id: php_hwapi.h,v 1.3 2005/02/07 23:03:48 rasmus Exp $ */
#ifndef PHP_HWAPI_H
#define PHP_HWAPI_H
@@ -66,8 +66,6 @@
#endif
extern PHP_MINIT_FUNCTION(hwapi);
-extern PHP_MSHUTDOWN_FUNCTION(hwapi);
-extern PHP_RINIT_FUNCTION(hwapi);
PHP_MINFO_FUNCTION(hwapi);
/* HW_API */
http://cvs.php.net/diff.php/php-src/ext/mono/php_mono.c?r1=1.14&r2=1.15&ty=u
Index: php-src/ext/mono/php_mono.c
diff -u php-src/ext/mono/php_mono.c:1.14 php-src/ext/mono/php_mono.c:1.15
--- php-src/ext/mono/php_mono.c:1.14 Sun Feb 15 06:32:26 2004
+++ php-src/ext/mono/php_mono.c Mon Feb 7 18:03:48 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_mono.c,v 1.14 2004/02/15 11:32:26 jan Exp $ */
+/* $Id: php_mono.c,v 1.15 2005/02/07 23:03:48 rasmus Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1084,21 +1084,6 @@
return SUCCESS;
}
-
-
-ZEND_RINIT_FUNCTION(mono)
-{
- return SUCCESS;
-}
-
-
-
-ZEND_RSHUTDOWN_FUNCTION(mono)
-{
- return SUCCESS;
-}
-
-
ZEND_MINFO_FUNCTION(mono)
{
php_info_print_table_start();
@@ -1120,8 +1105,8 @@
mono_functions,
ZEND_MINIT(mono),
ZEND_MSHUTDOWN(mono),
- ZEND_RINIT(mono),
- ZEND_RSHUTDOWN(mono),
+ NULL,
+ NULL,
ZEND_MINFO(mono),
"0.1",
STANDARD_MODULE_PROPERTIES
http://cvs.php.net/diff.php/php-src/ext/msession/msession.c?r1=1.46&r2=1.47&ty=u
Index: php-src/ext/msession/msession.c
diff -u php-src/ext/msession/msession.c:1.46
php-src/ext/msession/msession.c:1.47
--- php-src/ext/msession/msession.c:1.46 Wed Jun 30 09:43:07 2004
+++ php-src/ext/msession/msession.c Mon Feb 7 18:03:48 2005
@@ -156,9 +156,9 @@
"msession",
msession_functions,
PHP_MINIT(msession),
- PHP_MSHUTDOWN(msession),
- PHP_RINIT(msession),
- PHP_RSHUTDOWN(msession),
+ NULL,
+ NULL,
+ NULL,
PHP_MINFO(msession),
#ifdef PHP_4_1
NO_VERSION_YET,
@@ -181,21 +181,6 @@
return SUCCESS;
}
-PHP_MSHUTDOWN_FUNCTION(msession)
-{
- return SUCCESS;
-}
-
-PHP_RINIT_FUNCTION(msession)
-{
- return SUCCESS;
-}
-
-PHP_RSHUTDOWN_FUNCTION(msession)
-{
- return SUCCESS;
-}
-
PHP_MINFO_FUNCTION(msession)
{
php_info_print_table_start();
http://cvs.php.net/diff.php/php-src/ext/msession/php_msession.h?r1=1.12&r2=1.13&ty=u
Index: php-src/ext/msession/php_msession.h
diff -u php-src/ext/msession/php_msession.h:1.12
php-src/ext/msession/php_msession.h:1.13
--- php-src/ext/msession/php_msession.h:1.12 Thu Jan 8 12:32:26 2004
+++ php-src/ext/msession/php_msession.h Mon Feb 7 18:03:48 2005
@@ -35,9 +35,6 @@
#endif
PHP_MINIT_FUNCTION(msession);
-PHP_MSHUTDOWN_FUNCTION(msession);
-PHP_RINIT_FUNCTION(msession);
-PHP_RSHUTDOWN_FUNCTION(msession);
PHP_MINFO_FUNCTION(msession);
PHP_FUNCTION(msession_connect);
http://cvs.php.net/diff.php/php-src/ext/ncurses/ncurses.c?r1=1.28&r2=1.29&ty=u
Index: php-src/ext/ncurses/ncurses.c
diff -u php-src/ext/ncurses/ncurses.c:1.28 php-src/ext/ncurses/ncurses.c:1.29
--- php-src/ext/ncurses/ncurses.c:1.28 Thu May 20 13:03:23 2004
+++ php-src/ext/ncurses/ncurses.c Mon Feb 7 18:03:48 2005
@@ -59,8 +59,8 @@
ncurses_functions,
PHP_MINIT(ncurses),
PHP_MSHUTDOWN(ncurses),
- PHP_RINIT(ncurses), /* Replace with NULL if there's nothing to do
at request start */
- PHP_RSHUTDOWN(ncurses), /* Replace with NULL if there's nothing to do
at request end */
+ NULL,
+ NULL,
PHP_MINFO(ncurses),
NO_VERSION_YET,
STANDARD_MODULE_PROPERTIES
@@ -264,24 +264,6 @@
}
/* }}} */
-/* Remove if there's nothing to do at request start */
-/* {{{ PHP_RINIT_FUNCTION
- */
-PHP_RINIT_FUNCTION(ncurses)
-{
- return SUCCESS;
-}
-/* }}} */
-
-/* Remove if there's nothing to do at request end */
-/* {{{ PHP_RSHUTDOWN_FUNCTION
- */
-PHP_RSHUTDOWN_FUNCTION(ncurses)
-{
- return SUCCESS;
-}
-/* }}} */
-
/* {{{ PHP_MINFO_FUNCTION
*/
PHP_MINFO_FUNCTION(ncurses)
http://cvs.php.net/diff.php/php-src/ext/ncurses/php_ncurses.h?r1=1.16&r2=1.17&ty=u
Index: php-src/ext/ncurses/php_ncurses.h
diff -u php-src/ext/ncurses/php_ncurses.h:1.16
php-src/ext/ncurses/php_ncurses.h:1.17
--- php-src/ext/ncurses/php_ncurses.h:1.16 Thu Jan 22 22:28:57 2004
+++ php-src/ext/ncurses/php_ncurses.h Mon Feb 7 18:03:49 2005
@@ -47,8 +47,6 @@
PHP_MINIT_FUNCTION(ncurses);
PHP_MSHUTDOWN_FUNCTION(ncurses);
-PHP_RINIT_FUNCTION(ncurses);
-PHP_RSHUTDOWN_FUNCTION(ncurses);
PHP_MINFO_FUNCTION(ncurses);
ZEND_BEGIN_MODULE_GLOBALS(ncurses)
http://cvs.php.net/diff.php/php-src/ext/tidy/php_tidy.h?r1=1.22&r2=1.23&ty=u
Index: php-src/ext/tidy/php_tidy.h
diff -u php-src/ext/tidy/php_tidy.h:1.22 php-src/ext/tidy/php_tidy.h:1.23
--- php-src/ext/tidy/php_tidy.h:1.22 Sun Apr 11 23:14:19 2004
+++ php-src/ext/tidy/php_tidy.h Mon Feb 7 18:03:49 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_tidy.h,v 1.22 2004/04/12 03:14:19 john Exp $ */
+/* $Id: php_tidy.h,v 1.23 2005/02/07 23:03:49 rasmus Exp $ */
#ifndef PHP_TIDY_H
#define PHP_TIDY_H
@@ -42,7 +42,6 @@
PHP_MINIT_FUNCTION(tidy);
PHP_MSHUTDOWN_FUNCTION(tidy);
PHP_RINIT_FUNCTION(tidy);
-PHP_RSHUTDOWN_FUNCTION(tidy);
PHP_MINFO_FUNCTION(tidy);
PHP_FUNCTION(tidy_getopt);
http://cvs.php.net/diff.php/php-src/ext/tidy/tidy.c?r1=1.61&r2=1.62&ty=u
Index: php-src/ext/tidy/tidy.c
diff -u php-src/ext/tidy/tidy.c:1.61 php-src/ext/tidy/tidy.c:1.62
--- php-src/ext/tidy/tidy.c:1.61 Thu Dec 30 06:56:18 2004
+++ php-src/ext/tidy/tidy.c Mon Feb 7 18:03:49 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: tidy.c,v 1.61 2004/12/30 11:56:18 tony2001 Exp $ */
+/* $Id: tidy.c,v 1.62 2005/02/07 23:03:49 rasmus Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -297,7 +297,7 @@
PHP_MINIT(tidy),
PHP_MSHUTDOWN(tidy),
PHP_RINIT(tidy),
- PHP_RSHUTDOWN(tidy),
+ NULL,
PHP_MINFO(tidy),
PHP_TIDY_MODULE_VERSION,
STANDARD_MODULE_PROPERTIES
@@ -946,17 +946,12 @@
return SUCCESS;
}
-PHP_RSHUTDOWN_FUNCTION(tidy)
-{
- return SUCCESS;
-}
-
PHP_MINFO_FUNCTION(tidy)
{
php_info_print_table_start();
php_info_print_table_header(2, "Tidy support", "enabled");
php_info_print_table_row(2, "libTidy Release", (char
*)tidyReleaseDate());
- php_info_print_table_row(2, "Extension Version",
PHP_TIDY_MODULE_VERSION " ($Id: tidy.c,v 1.61 2004/12/30 11:56:18 tony2001 Exp
$)");
+ php_info_print_table_row(2, "Extension Version",
PHP_TIDY_MODULE_VERSION " ($Id: tidy.c,v 1.62 2005/02/07 23:03:49 rasmus Exp
$)");
php_info_print_table_end();
DISPLAY_INI_ENTRIES();
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
