MFH eliminating a few more useless R* calls

diff --git a/ext/fam/fam.c b/ext/fam/fam.c
index d83ad77cef89427f7f6231ac4b7617df739efd83..24e3395e3b048499207c3e78f06c3bfa9f5b9e91 100644 (file)
--- a/ext/fam/fam.c
+++ b/ext/fam/fam.c
@@ -64,9 +64,9 @@ zend_module_entry fam_module_entry = {
        "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_MINIT_FUNCTION(fam)
 }
 /* }}} */
 
-/* {{{ 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)

diff --git a/ext/fam/php_fam.h b/ext/fam/php_fam.h
index d234ea92a7a51d4b2c17dcd4e87914870493a7e8..28c4e97851eb2ffa58bba93d2f2e25999b739406 100644 (file)
--- a/ext/fam/php_fam.h
+++ b/ext/fam/php_fam.h
@@ -35,9 +35,6 @@ extern zend_module_entry fam_module_entry;
 #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);

diff --git a/ext/hwapi/hwapi.cpp b/ext/hwapi/hwapi.cpp
index 157195ae01cfa6bad6ddcdab660b726886c8802d..b2530d6cf702d80f9f43abd5276afa20ae4e4dcb 100644 (file)
--- a/ext/hwapi/hwapi.cpp
+++ b/ext/hwapi/hwapi.cpp
@@ -202,8 +202,8 @@ zend_module_entry hwapi_module_entry = {
        "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 @@ PHP_MINIT_FUNCTION(hwapi) {
        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");

diff --git a/ext/hwapi/php_hwapi.h b/ext/hwapi/php_hwapi.h
index 9c199134fddc9822255abd3477a3a9eb7bba9af7..2c54d04fea524a19aefa875f7e6afd3c5096347f 100644 (file)
--- a/ext/hwapi/php_hwapi.h
+++ b/ext/hwapi/php_hwapi.h
@@ -66,8 +66,6 @@ extern PHP_HWAPI_API zend_hwapi_globals hwapi_globals;
 #endif
 
 extern PHP_MINIT_FUNCTION(hwapi);
-extern PHP_MSHUTDOWN_FUNCTION(hwapi);
-extern PHP_RINIT_FUNCTION(hwapi);
 PHP_MINFO_FUNCTION(hwapi);
 
 /* HW_API */

diff --git a/ext/xml/xml.c b/ext/xml/xml.c
index fba42e2e712133e4a4b0bb2f4819a02a73db6bdc..e2b8bb040e9496e7ff92f8d8608e15511542a1be 100644 (file)
--- a/ext/xml/xml.c
+++ b/ext/xml/xml.c
@@ -74,9 +74,6 @@ ZEND_GET_MODULE(xml)
 
 /* {{{ 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 @@ zend_module_entry xml_module_entry = {
        "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 @@ PHP_MINIT_FUNCTION(xml)
        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();