Get rid of more useless RINIT/RSHUTDOWN calls

10 files changed, 11 insertions, 97 deletions

diff --git a/ext/fam/fam.c b/ext/fam/fam.c
index d83ad77cef..24e3395e3b 100644
--- 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 d234ea92a7..28c4e97851 100644
--- 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 157195ae01..b2530d6cf7 100644
--- 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 9c199134fd..2c54d04fea 100644
--- 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/msession/msession.c b/ext/msession/msession.c
index 60f4360808..b3771b1337 100644
--- a/ext/msession/msession.c
+++ b/ext/msession/msession.c
@@ -156,9 +156,9 @@ zend_module_entry msession_module_entry = {
 	"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 @@ PHP_MINIT_FUNCTION(msession)
 	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();
diff --git a/ext/msession/php_msession.h b/ext/msession/php_msession.h
index edd2a7bb6d..aab7e915d2 100644
--- a/ext/msession/php_msession.h
+++ b/ext/msession/php_msession.h
@@ -35,9 +35,6 @@ extern zend_module_entry msession_module_entry;
 #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);
diff --git a/ext/ncurses/ncurses.c b/ext/ncurses/ncurses.c
index eedd8a32c0..4e260c625e 100644
--- a/ext/ncurses/ncurses.c
+++ b/ext/ncurses/ncurses.c
@@ -59,8 +59,8 @@ zend_module_entry ncurses_module_entry = {
 	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 @@ PHP_MSHUTDOWN_FUNCTION(ncurses)
 }
 /* }}} */
 
-/* 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)
diff --git a/ext/ncurses/php_ncurses.h b/ext/ncurses/php_ncurses.h
index 6d17f9b4b8..aae0aef094 100644
--- a/ext/ncurses/php_ncurses.h
+++ b/ext/ncurses/php_ncurses.h
@@ -47,8 +47,6 @@ extern function_entry ncurses_functions[];
 
 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)
diff --git a/ext/tidy/php_tidy.h b/ext/tidy/php_tidy.h
index c6db213256..234bb13fdd 100644
--- a/ext/tidy/php_tidy.h
+++ b/ext/tidy/php_tidy.h
@@ -42,7 +42,6 @@ extern zend_module_entry tidy_module_entry;
 PHP_MINIT_FUNCTION(tidy);
 PHP_MSHUTDOWN_FUNCTION(tidy);
 PHP_RINIT_FUNCTION(tidy);
-PHP_RSHUTDOWN_FUNCTION(tidy);
 PHP_MINFO_FUNCTION(tidy);
 
 PHP_FUNCTION(tidy_getopt);
diff --git a/ext/tidy/tidy.c b/ext/tidy/tidy.c
index 75a2b6e164..b91a240a64 100644
--- a/ext/tidy/tidy.c
+++ b/ext/tidy/tidy.c
@@ -297,7 +297,7 @@ zend_module_entry tidy_module_entry = {
 	PHP_MINIT(tidy),
 	PHP_MSHUTDOWN(tidy),
 	PHP_RINIT(tidy),
-	PHP_RSHUTDOWN(tidy),
+	NULL,
 	PHP_MINFO(tidy),
 	PHP_TIDY_MODULE_VERSION,
 	STANDARD_MODULE_PROPERTIES
@@ -946,11 +946,6 @@ PHP_RINIT_FUNCTION(tidy)
 	return SUCCESS;
 }
 
-PHP_RSHUTDOWN_FUNCTION(tidy)
-{
-	return SUCCESS;
-}
-
 PHP_MINFO_FUNCTION(tidy)
 {
 	php_info_print_table_start();