rasmus Tue Feb 8 00:38:05 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src/ext/fam fam.c php_fam.h
/php-src/ext/hwapi hwapi.cpp php_hwapi.h
/php-src/ext/xml xml.c
Log:
MFH eliminating a few more useless R* calls
http://cvs.php.net/diff.php/php-src/ext/fam/fam.c?r1=1.8&r2=1.8.2.1&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.8.2.1
--- php-src/ext/fam/fam.c:1.8 Thu May 20 13:03:24 2004
+++ php-src/ext/fam/fam.c Tue Feb 8 00:38:04 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.8.2.1 2005/02/08 05:38:04 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.4.2.1&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.4.2.1
--- php-src/ext/fam/php_fam.h:1.4 Thu Jan 8 12:32:05 2004
+++ php-src/ext/fam/php_fam.h Tue Feb 8 00:38:04 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.4.2.1 2005/02/08 05:38:04 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.10.2.1&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.10.2.1
--- php-src/ext/hwapi/hwapi.cpp:1.10 Sun Jun 15 12:04:26 2003
+++ php-src/ext/hwapi/hwapi.cpp Tue Feb 8 00:38:04 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: hwapi.cpp,v 1.10 2003/06/15 16:04:26 andrey Exp $ */
+/* $Id: hwapi.cpp,v 1.10.2.1 2005/02/08 05:38:04 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.2.2.1&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.2.2.1
--- php-src/ext/hwapi/php_hwapi.h:1.2 Tue Jun 10 16:03:29 2003
+++ php-src/ext/hwapi/php_hwapi.h Tue Feb 8 00:38:04 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.2.2.1 2005/02/08 05:38:04 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/xml/xml.c?r1=1.151.2.1&r2=1.151.2.2&ty=u
Index: php-src/ext/xml/xml.c
diff -u php-src/ext/xml/xml.c:1.151.2.1 php-src/ext/xml/xml.c:1.151.2.2
--- php-src/ext/xml/xml.c:1.151.2.1 Thu Aug 19 08:29:43 2004
+++ php-src/ext/xml/xml.c Tue Feb 8 00:38:04 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: xml.c,v 1.151.2.1 2004/08/19 12:29:43 chregu Exp $ */
+/* $Id: xml.c,v 1.151.2.2 2005/02/08 05:38:04 rasmus Exp $ */
#define IS_EXT_MODULE
@@ -74,9 +74,6 @@
/* {{{ function prototypes */
PHP_MINIT_FUNCTION(xml);
-PHP_RINIT_FUNCTION(xml);
-PHP_MSHUTDOWN_FUNCTION(xml);
-PHP_RSHUTDOWN_FUNCTION(xml);
PHP_MINFO_FUNCTION(xml);
static void xml_parser_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC);
@@ -147,9 +144,9 @@
"xml", /* extension name */
xml_functions, /* extension function list */
PHP_MINIT(xml), /* extension-wide startup function */
- PHP_MSHUTDOWN(xml), /* extension-wide shutdown function */
- PHP_RINIT(xml), /* per-request startup function */
- PHP_RSHUTDOWN(xml), /* per-request shutdown function */
+ NULL, /* extension-wide shutdown function */
+ NULL, /* per-request startup function */
+ NULL, /* per-request shutdown function */
PHP_MINFO(xml), /* information function */
NO_VERSION_YET,
STANDARD_MODULE_PROPERTIES
@@ -251,25 +248,6 @@
return SUCCESS;
}
-
-PHP_RINIT_FUNCTION(xml)
-{
- return SUCCESS;
-}
-
-
-PHP_MSHUTDOWN_FUNCTION(xml)
-{
- return SUCCESS;
-}
-
-
-PHP_RSHUTDOWN_FUNCTION(xml)
-{
- return SUCCESS;
-}
-
-
PHP_MINFO_FUNCTION(xml)
{
php_info_print_table_start();
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
