More TSRMLS_FETCH work, and a bit of cleanup

diff --git a/ext/bcmath/bcmath.c b/ext/bcmath/bcmath.c
index 5771477c0ff47283a7b2d00decc99470c4509dd1..7f59fd3c472d8dffcb3168e3335e51212612630f 100644 (file)
--- a/ext/bcmath/bcmath.c
+++ b/ext/bcmath/bcmath.c
@@ -126,9 +126,9 @@ PHP_RINIT_FUNCTION(bcmath)
 
 PHP_MINFO_FUNCTION(bcmath)
 {
-  php_info_print_table_start();
-  php_info_print_table_row(2, "BCMath support", "enabled");
-  php_info_print_table_end();
+       php_info_print_table_start();
+       php_info_print_table_row(2, "BCMath support", "enabled");
+       php_info_print_table_end();
 }
 
 /* {{{ proto string bcadd(string left_operand, string right_operand [, int scale])

diff --git a/ext/calendar/calendar.c b/ext/calendar/calendar.c
index c2d40f52db908266f5d4470e7fc8908832dae8fa..1823db120c560723e204b542a073a6856638616e 100644 (file)
--- a/ext/calendar/calendar.c
+++ b/ext/calendar/calendar.c
@@ -57,14 +57,14 @@ function_entry calendar_functions[] = {
 
 
 zend_module_entry calendar_module_entry = {
-  "calendar", 
-  calendar_functions, 
-  PHP_MINIT(calendar),
-  NULL,
-  NULL,
-  NULL,
-  PHP_MINFO(calendar),
-  STANDARD_MODULE_PROPERTIES,
+       "calendar", 
+       calendar_functions, 
+       PHP_MINIT(calendar),
+       NULL,
+       NULL,
+       NULL,
+       PHP_MINFO(calendar),
+       STANDARD_MODULE_PROPERTIES,
 };
 
 #ifdef COMPILE_DL_CALENDAR

diff --git a/ext/com/COM.c b/ext/com/COM.c
index c10865cdd85e555556653df81ffe3c7ce92bc2de..ddd3a4a7ae13a6ac9c3441b07fa3673934557f0c 100644 (file)
--- a/ext/com/COM.c
+++ b/ext/com/COM.c
@@ -352,7 +352,6 @@ static PHP_INI_MH(OnTypelibFileChange)
        char *typelib_name_buffer;
        char *strtok_buf = NULL;
        int interactive;
-       TSRMLS_FETCH();
 
        interactive = CG(interactive);
 

diff --git a/ext/cpdf/cpdf.c b/ext/cpdf/cpdf.c
index 12682c8ae23617812764839ca8f909f4b68e4032..087ad405eb4f8e778c6a80951fa9ded0e844bc81 100644 (file)
--- a/ext/cpdf/cpdf.c
+++ b/ext/cpdf/cpdf.c
@@ -205,7 +205,8 @@ PHP_MINFO_FUNCTION(cpdf) {
        php_info_print_table_end();
 }
 
-PHP_MSHUTDOWN_FUNCTION(cpdf){
+PHP_MSHUTDOWN_FUNCTION(cpdf)
+{
        return SUCCESS;
 }
 

diff --git a/ext/crack/crack.c b/ext/crack/crack.c
index a3e2d8916d5cba8a32196bae4a9bd8d32ca0c533..e69c63e2905849bb843b1850f11ba3be08161fca 100644 (file)
--- a/ext/crack/crack.c
+++ b/ext/crack/crack.c
@@ -104,7 +104,6 @@ ZEND_MINIT_FUNCTION(crack)
 ZEND_MSHUTDOWN_FUNCTION(crack)
 {
        UNREGISTER_INI_ENTRIES();
-
        return SUCCESS;
 }
 
@@ -118,12 +117,9 @@ ZEND_RINIT_FUNCTION(crack)
 
 ZEND_RSHUTDOWN_FUNCTION(crack)
 {
-       TSRMLS_FETCH();
-
        if (NULL != CRACKG(last_message)) {
                efree(CRACKG(last_message));
        }
-
        return SUCCESS;
 }
 

diff --git a/ext/ctype/ctype.c b/ext/ctype/ctype.c
index 5265f1d5b1bf7c0ca63c93ad9d1e759f17c44edb..6528b9411cf5e0280f48494a46400330a3e8e322 100644 (file)
--- a/ext/ctype/ctype.c
+++ b/ext/ctype/ctype.c
@@ -85,8 +85,6 @@ ZEND_GET_MODULE(ctype)
  */
 PHP_MINFO_FUNCTION(ctype)
 {
-       TSRMLS_FETCH();
-
        php_info_print_table_start();
        php_info_print_table_row(2, "ctype functions", "enabled (experimental)");
        php_info_print_table_end();

diff --git a/ext/dbplus/dbplus.c b/ext/dbplus/dbplus.c
index 1768108e5f9239092ef51d9d1ca8aea5fa0d881e..816a55960e0e58a5141e9afc484b69e5b39d6047 100644 (file)
--- a/ext/dbplus/dbplus.c
+++ b/ext/dbplus/dbplus.c
@@ -147,9 +147,6 @@ PHP_MINIT_FUNCTION(dbplus)
 
 PHP_MSHUTDOWN_FUNCTION(dbplus)
 {
-/* Remove comments if you have entries in php.ini
-       UNREGISTER_INI_ENTRIES();
-*/
        return SUCCESS;
 }
 

diff --git a/ext/ereg/ereg.c b/ext/ereg/ereg.c
index 63344b8878c35f879bee27fd6600271f07913495..7ffb343a7635cf36fcfb1e34bf698971b764c417 100644 (file)
--- a/ext/ereg/ereg.c
+++ b/ext/ereg/ereg.c
@@ -102,8 +102,6 @@ PHP_MINIT_FUNCTION(regex)
 
 PHP_MSHUTDOWN_FUNCTION(regex)
 {
-       TSRMLS_FETCH();
-
        zend_hash_destroy(&REG(ht_rc));
        return SUCCESS;
 }

diff --git a/ext/exif/exif.c b/ext/exif/exif.c
index 6cfba995f216231d74fe3062061679ddcbdf7d6d..00733a878dd4f44b8202127e5b7cb835b2826d15 100644 (file)
--- a/ext/exif/exif.c
+++ b/ext/exif/exif.c
@@ -142,7 +142,8 @@ ZEND_GET_MODULE(exif)
 
 /* {{{ PHP_MINFO_FUNCTION
  */
-PHP_MINFO_FUNCTION(exif) {
+PHP_MINFO_FUNCTION(exif)
+{
        php_info_print_table_start();
     php_info_print_table_row(2, "EXIF Support", "enabled" );
     php_info_print_table_end();

diff --git a/ext/fbsql/php_fbsql.c b/ext/fbsql/php_fbsql.c
index 7428cf779070697c1179adf6e75e04960fa2d12d..61b83343e5364a90c83aadcc2d64092f53ce2d2f 100644 (file)
--- a/ext/fbsql/php_fbsql.c
+++ b/ext/fbsql/php_fbsql.c
@@ -405,7 +405,6 @@ PHP_RSHUTDOWN_FUNCTION(fbsql)
 PHP_MINFO_FUNCTION(fbsql)
 {
        char buf[32];
-       TSRMLS_FETCH();
 
        php_info_print_table_start();
        php_info_print_table_header(2, "FrontBase support", "enabled");

diff --git a/ext/filepro/filepro.c b/ext/filepro/filepro.c
index b08a4eee31a9754bdeb04ae245aa8c9a0c884b87..a997934bdacde2caa8b2eca1c375839f423510a1 100644 (file)
--- a/ext/filepro/filepro.c
+++ b/ext/filepro/filepro.c
@@ -120,10 +120,11 @@ PHP_MSHUTDOWN_FUNCTION(filepro)
        SET_MUTEX(fp_mutex);
        numthreads--;
        if (!numthreads){
-       if (!TlsFree(FPTls)){
-               FREE_MUTEX(fp_mutex);
-               return 0;
-       }}
+               if (!TlsFree(FPTls)){
+                       FREE_MUTEX(fp_mutex);
+                       return 0;
+               }
+       }
        FREE_MUTEX(fp_mutex);
 #endif
 #endif

diff --git a/ext/ftp/php_ftp.c b/ext/ftp/php_ftp.c
index 803f2bf6cf68f98afb61ade197a2fd9572e5d0b5..208a4506955399e47ec1f0fe9ad7f51ccd790d45 100644 (file)
--- a/ext/ftp/php_ftp.c
+++ b/ext/ftp/php_ftp.c
@@ -98,9 +98,9 @@ PHP_MINIT_FUNCTION(ftp)
 
 PHP_MINFO_FUNCTION(ftp)
 {
-  php_info_print_table_start();
-  php_info_print_table_row(2, "FTP support", "enabled");
-  php_info_print_table_end();
+       php_info_print_table_start();
+       php_info_print_table_row(2, "FTP support", "enabled");
+       php_info_print_table_end();
 }
 
 

diff --git a/ext/gmp/gmp.c b/ext/gmp/gmp.c
index a5dc03b1406c88289ade07df9ec6e588180f32f3..1675093e3f24809ed45d8502ed90f7c11bf8a37b 100644 (file)
--- a/ext/gmp/gmp.c
+++ b/ext/gmp/gmp.c
@@ -154,9 +154,6 @@ ZEND_MINIT_FUNCTION(gmp)
  */
 ZEND_MSHUTDOWN_FUNCTION(gmp)
 {
-/* Remove comments if you have entries in php.ini
-       UNREGISTER_INI_ENTRIES();
-*/
        return SUCCESS;
 }
 /* }}} */

diff --git a/ext/hyperwave/hw.c b/ext/hyperwave/hw.c
index 16903522af6c3ce2b32b80c10297226e1458d5a5..20df00487a327f364076eee637dc88e894b1b327 100644 (file)
--- a/ext/hyperwave/hw.c
+++ b/ext/hyperwave/hw.c
@@ -196,8 +196,6 @@ static void php_hw_init_globals(zend_hw_globals *hw_globals)
 
 static PHP_INI_MH(OnHyperwavePort)
 {
-       TSRMLS_FETCH();
-
        if (new_value==NULL) {
                HwSG(default_port) = HG_SERVER_PORT;
        } else {

diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c
index 051e144c2126f264204c919297d3d1c2779d5e2f..c4be4a392eb96b66c09973bc8853c269f6412a94 100644 (file)
--- a/ext/imap/php_imap.c
+++ b/ext/imap/php_imap.c
@@ -310,7 +310,6 @@ PHP_RSHUTDOWN_FUNCTION(imap)
 {
        ERRORLIST *ecur = NIL;
        STRINGLIST *acur = NIL;
-       TSRMLS_FETCH();
 
        if (IMAPG(imap_errorstack) != NIL) {
                /* output any remaining errors at their original error level */

diff --git a/ext/ingres_ii/ii.c b/ext/ingres_ii/ii.c
index 6d0ff7ab4e762e4646b66a6dbdebcd68495c44c7..4cc642bf193c8c2177e636a11af9e9cc1223922d 100644 (file)
--- a/ext/ingres_ii/ii.c
+++ b/ext/ingres_ii/ii.c
@@ -67,14 +67,14 @@ function_entry ii_functions[] = {
 };
 
 zend_module_entry ingres_ii_module_entry = {
-  "ingres_ii",
-  ii_functions,
-  PHP_MINIT(ii),
-  PHP_MSHUTDOWN(ii),
-  PHP_RINIT(ii),
-  PHP_RSHUTDOWN(ii),
-  PHP_MINFO(ii),
-  STANDARD_MODULE_PROPERTIES
+       "ingres_ii",
+       ii_functions,
+       PHP_MINIT(ii),
+       PHP_MSHUTDOWN(ii),
+       PHP_RINIT(ii),
+       PHP_RSHUTDOWN(ii),
+       PHP_MINFO(ii),
+       STANDARD_MODULE_PROPERTIES
 };
 
 #ifdef COMPILE_DL_INGRES_II
@@ -312,8 +312,6 @@ PHP_RINIT_FUNCTION(ii)
 */
 PHP_RSHUTDOWN_FUNCTION(ii)
 {
-  TSRMLS_FETCH();
-
   if (IIG(default_link)!=-1) {
     zend_list_delete(IIG(default_link));
     IIG(default_link) = -1;
@@ -326,7 +324,6 @@ PHP_RSHUTDOWN_FUNCTION(ii)
 PHP_MINFO_FUNCTION(ii)
 {
   char buf[32];
-  TSRMLS_FETCH();
 
   php_info_print_table_start();
   php_info_print_table_header(2, "Ingres II Support", "enabled");

diff --git a/ext/interbase/interbase.c b/ext/interbase/interbase.c
index 42db0388c77e0e3f9dddb3665f1bce3328751cc2..d8a76a0e9bae4b96680bf816af8def12c670fcb9 100644 (file)
--- a/ext/interbase/interbase.c
+++ b/ext/interbase/interbase.c
@@ -554,8 +554,6 @@ PHP_MSHUTDOWN_FUNCTION(ibase)
 
 PHP_RSHUTDOWN_FUNCTION(ibase)
 {
-    TSRMLS_FETCH();
-
        if (IBG(timestampformat))
            DL_FREE(IBG(timestampformat));
        IBG(timestampformat) = NULL;

diff --git a/ext/java/java.c b/ext/java/java.c
index 61af18ff359839f09f447aeea76f7450fa8fceda..fd9d77b2ae93d2164e5ef6ad0b2c9904d9d2061e 100644 (file)
--- a/ext/java/java.c
+++ b/ext/java/java.c
@@ -106,10 +106,11 @@ php_java_globals java_globals;
 
 static zend_class_entry java_class_entry;
 
-static PHP_INI_MH(OnIniUpdate) {
-  if (new_value) *(char**)mh_arg1 = new_value;
-  iniUpdated=1;
-  return SUCCESS;
+static PHP_INI_MH(OnIniUpdate)
+{
+       if (new_value) *(char**)mh_arg1 = new_value;
+       iniUpdated=1;
+       return SUCCESS;
 }
 
 PHP_INI_BEGIN()

diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
index 7dd1cb796238434ee70050a431eff263682c48fc..4c97b9fb7f1cbf73f2d53f51d4375c735720f7e2 100644 (file)
--- a/ext/mbstring/mbstring.c
+++ b/ext/mbstring/mbstring.c
@@ -287,7 +287,6 @@ php_mbstring_parse_encoding_array(zval *array, int **return_list, int *return_si
 static PHP_INI_MH(OnUpdate_mbstring_detect_order)
 {
        int *list, size;
-       TSRMLS_FETCH();
 
        if (php_mbstring_parse_encoding_list(new_value, new_value_length, &list, &size, 1)) {
                if (MBSTRG(detect_order_list) != NULL) {
@@ -305,7 +304,6 @@ static PHP_INI_MH(OnUpdate_mbstring_detect_order)
 static PHP_INI_MH(OnUpdate_mbstring_http_input)
 {
        int *list, size;
-       TSRMLS_FETCH();
 
        if (php_mbstring_parse_encoding_list(new_value, new_value_length, &list, &size, 1)) {
                if (MBSTRG(http_input_list) != NULL) {
@@ -323,7 +321,6 @@ static PHP_INI_MH(OnUpdate_mbstring_http_input)
 static PHP_INI_MH(OnUpdate_mbstring_http_output)
 {
        enum mbfl_no_encoding no_encoding;
-       TSRMLS_FETCH();
 
        no_encoding = mbfl_name2no_encoding(new_value);
        if (no_encoding != mbfl_no_encoding_invalid) {
@@ -341,7 +338,6 @@ static PHP_INI_MH(OnUpdate_mbstring_http_output)
 static PHP_INI_MH(OnUpdate_mbstring_internal_encoding)
 {
        enum mbfl_no_encoding no_encoding;
-       TSRMLS_FETCH();
 
        no_encoding = mbfl_name2no_encoding(new_value);
        if (no_encoding != mbfl_no_encoding_invalid) {
@@ -358,8 +354,6 @@ static PHP_INI_MH(OnUpdate_mbstring_internal_encoding)
 
 static PHP_INI_MH(OnUpdate_mbstring_substitute_character)
 {
-       TSRMLS_FETCH();
-
        if (new_value != NULL) {
                if (strcasecmp("none", new_value) == 0) {
                        MBSTRG(filter_illegal_mode) = MBFL_OUTPUTFILTER_ILLEGAL_MODE_NONE;
@@ -428,7 +422,6 @@ PHP_MINIT_FUNCTION(mbstring)
 
 PHP_MSHUTDOWN_FUNCTION(mbstring)
 {
-       TSRMLS_FETCH();
        UNREGISTER_INI_ENTRIES();
        
        if (MBSTRG(http_input_list)) {
@@ -477,8 +470,6 @@ PHP_RINIT_FUNCTION(mbstring)
 
 PHP_RSHUTDOWN_FUNCTION(mbstring)
 {
-       TSRMLS_FETCH();
-
        if (MBSTRG(current_detect_order_list) != NULL) {
                efree(MBSTRG(current_detect_order_list));
                MBSTRG(current_detect_order_list) = NULL;

diff --git a/ext/mcal/php_mcal.c b/ext/mcal/php_mcal.c
index cb42cbd9621ba4177824cef198a80c09a37d7b6a..c34721764508eea31f4472f7ff11218ac7990055 100644 (file)
--- a/ext/mcal/php_mcal.c
+++ b/ext/mcal/php_mcal.c
@@ -139,8 +139,8 @@ PHP_MINFO_FUNCTION(mcal)
 {
        char tmp[128];
 
-        php_info_print_table_start();
-        php_info_print_table_row(2, "MCAL Support", "enabled" );
+       php_info_print_table_start();
+       php_info_print_table_row(2, "MCAL Support", "enabled" );
 #ifdef MCALVER
        snprintf(tmp, 128, "%s<BR>%d", CALVER, MCALVER);
 #else

diff --git a/ext/mssql/php_mssql.c b/ext/mssql/php_mssql.c
index c991ca0bfcf869bfd0a18dc6ea4a773e7434c81a..b3a80e38c15b184a58f92e33af920b5e5cf3f9a6 100644 (file)
--- a/ext/mssql/php_mssql.c
+++ b/ext/mssql/php_mssql.c
@@ -348,8 +348,6 @@ PHP_RINIT_FUNCTION(mssql)
 
 PHP_RSHUTDOWN_FUNCTION(mssql)
 {
-       TSRMLS_FETCH();
-
        STR_FREE(MS_SQL_G(appname));
        if (MS_SQL_G(server_message)) {
                STR_FREE(MS_SQL_G(server_message));
@@ -360,7 +358,6 @@ PHP_RSHUTDOWN_FUNCTION(mssql)
 PHP_MINFO_FUNCTION(mssql)
 {
        char buf[32];
-       TSRMLS_FETCH();
 
        php_info_print_table_start();
        php_info_print_table_header(2, "MSSQL Support", "enabled");

diff --git a/ext/muscat/muscat.c b/ext/muscat/muscat.c
index 092ee0014daf793fc3483bb4010023f2832a866e..2b326332051705144864a9b69f11db2fb6d6210c 100644 (file)
--- a/ext/muscat/muscat.c
+++ b/ext/muscat/muscat.c
@@ -112,9 +112,6 @@ PHP_MINIT_FUNCTION(muscat)
 
 PHP_MSHUTDOWN_FUNCTION(muscat)
 {
-/* Remove comments if you have entries in php.ini
-       UNREGISTER_INI_ENTRIES();
-*/
        return SUCCESS;
 }
 

diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c
index d1c47e7dedea33ec495dc267b0bd0a16772f1caf..f15f5507a6e20edbdaa78963798146da982703bd 100644 (file)
--- a/ext/mysql/php_mysql.c
+++ b/ext/mysql/php_mysql.c
@@ -211,10 +211,8 @@ static void _free_mysql_result(zend_rsrc_list_entry *rsrc)
 
 /* {{{ php_mysql_set_default_link
  */
-static void php_mysql_set_default_link(int id)
+static void php_mysql_set_default_link(int id TSRMLS_DC)
 {
-       TSRMLS_FETCH();
-
        if (MySG(default_link)!=-1) {
                zend_list_delete(MySG(default_link));
        }
@@ -261,8 +259,6 @@ static void _close_mysql_plink(zend_rsrc_list_entry *rsrc)
  */
 static PHP_INI_MH(OnMySQLPort)
 {
-       TSRMLS_FETCH();
-
        if (new_value==NULL) { /* default port */
 #ifndef PHP_WIN32
                struct servent *serv_ptr;
@@ -360,7 +356,6 @@ PHP_RINIT_FUNCTION(mysql)
  */
 PHP_RSHUTDOWN_FUNCTION(mysql)
 {
-       TSRMLS_FETCH();
        if (MySG(connect_error)!=NULL) {
                efree(MySG(connect_error));
        }
@@ -373,7 +368,6 @@ PHP_RSHUTDOWN_FUNCTION(mysql)
 PHP_MINFO_FUNCTION(mysql)
 {
        char buf[32];
-       TSRMLS_FETCH();
 
        php_info_print_table_start();
        php_info_print_table_header(2, "MySQL Support", "enabled");
@@ -606,7 +600,7 @@ static void php_mysql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent)
                        if (ptr && (type==le_link || type==le_plink)) {
                                zend_list_addref(link);
                                return_value->value.lval = link;
-                               php_mysql_set_default_link(link);
+                               php_mysql_set_default_link(link TSRMLS_CC);
                                return_value->type = IS_RESOURCE;
                                efree(hashed_details);
                                MYSQL_DO_CONNECT_CLEANUP();
@@ -656,7 +650,7 @@ static void php_mysql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent)
        }
 
        efree(hashed_details);
-       php_mysql_set_default_link(return_value->value.lval);
+       php_mysql_set_default_link(return_value->value.lval TSRMLS_CC);
        MYSQL_DO_CONNECT_CLEANUP();
 }
 /* }}} */
@@ -953,11 +947,10 @@ PHP_FUNCTION(mysql_drop_db)
 
 /* {{{ php_mysql_do_query_general
  */
-static void php_mysql_do_query_general(zval **query, zval **mysql_link, int link_id, zval **db, int use_store, zval *return_value)
+static void php_mysql_do_query_general(zval **query, zval **mysql_link, int link_id, zval **db, int use_store, zval *return_value TSRMLS_DC)
 {
        php_mysql_conn *mysql;
        MYSQL_RES *mysql_result;
-       TSRMLS_FETCH();
        
        ZEND_FETCH_RESOURCE2(mysql, php_mysql_conn *, mysql_link, link_id, "MySQL-Link", le_link, le_plink);
        
@@ -1039,7 +1032,7 @@ static void php_mysql_do_query(INTERNAL_FUNCTION_PARAMETERS, int use_store)
                        WRONG_PARAM_COUNT;
                        break;
        }
-       php_mysql_do_query_general(query, mysql_link, id, NULL, use_store, return_value);
+       php_mysql_do_query_general(query, mysql_link, id, NULL, use_store, return_value TSRMLS_CC);
 }
 /* }}} */
 
@@ -1089,7 +1082,7 @@ PHP_FUNCTION(mysql_db_query)
        
        zend_error(E_NOTICE, "%s is deprecated; use mysql_select_db() and mysql_query() instead", get_active_function_name());
        
-       php_mysql_do_query_general(query, mysql_link, id, db, MYSQL_STORE_RESULT, return_value);
+       php_mysql_do_query_general(query, mysql_link, id, db, MYSQL_STORE_RESULT, return_value TSRMLS_CC);
 }
 /* }}} */
 

diff --git a/ext/ncurses/ncurses.c b/ext/ncurses/ncurses.c
index 34c1a767da55ebed76cf431637618085a9c979b9..da588b3e3b224aa797447f5e2c8383e4676a95c2 100644 (file)
--- a/ext/ncurses/ncurses.c
+++ b/ext/ncurses/ncurses.c
@@ -94,11 +94,6 @@ PHP_MINIT_FUNCTION(ncurses)
  */
 PHP_MSHUTDOWN_FUNCTION(ncurses)
 {
-/* Remove comments if you have entries in php.ini
-       UNREGISTER_INI_ENTRIES();
-       endwin();
-*/
-
        return SUCCESS;
 }
 /* }}} */

diff --git a/ext/notes/php_notes.c b/ext/notes/php_notes.c
index 0c887ec03e034c90cf06c5b6d899e129c4ff0455..210107fd8a83f65fc150fce181e9486c29f21b23 100644 (file)
--- a/ext/notes/php_notes.c
+++ b/ext/notes/php_notes.c
@@ -140,7 +140,6 @@ PHP_MINFO_FUNCTION(notes)
 {
 
        php_info_print_table_start();
-
        php_info_print_table_row(2, "Lotus Notes Database Support", "enabled");
        php_info_print_table_end();
 }

diff --git a/ext/oci8/oci8.c b/ext/oci8/oci8.c
index 90f154c8a90fc26aca9ffdbaaa5f8e345cfdc140..4e0beb59993d7ed63f4768d9ef053527210cf649 100644 (file)
--- a/ext/oci8/oci8.c
+++ b/ext/oci8/oci8.c
@@ -535,8 +535,6 @@ static int _server_pcleanup(oci_server *server)
 
 PHP_MSHUTDOWN_FUNCTION(oci)
 {
-       TSRMLS_FETCH();
-
        OCI(shutdown) = 1;
 
     oci_debug("START php_mshutdown_oci");

diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c
index ff098f59787c2c10c5d04ced0f36aaf617fc8fdb..3847e83f37356d018ccf46bc5009e3d488d53272 100644 (file)
--- a/ext/odbc/php_odbc.c
+++ b/ext/odbc/php_odbc.c
@@ -467,8 +467,6 @@ PHP_RSHUTDOWN_FUNCTION(odbc)
 
 PHP_MSHUTDOWN_FUNCTION(odbc)
 {
-       TSRMLS_FETCH();
-
        UNREGISTER_INI_ENTRIES();
        return SUCCESS;
 }
@@ -476,7 +474,6 @@ PHP_MSHUTDOWN_FUNCTION(odbc)
 PHP_MINFO_FUNCTION(odbc)
 {
        char buf[32];
-       TSRMLS_FETCH();
 
        php_info_print_table_start();
        php_info_print_table_header(2, "ODBC Support", "enabled");

diff --git a/ext/oracle/oracle.c b/ext/oracle/oracle.c
index c9f1507c770b4b8678bff26517c3bec86969106f..10e86b9726c24d5f3c8bbf8ecbaf030ed494cc20 100644 (file)
--- a/ext/oracle/oracle.c
+++ b/ext/oracle/oracle.c
@@ -361,11 +361,8 @@ PHP_RINIT_FUNCTION(oracle)
  */
 PHP_MSHUTDOWN_FUNCTION(oracle)
 {
-       TSRMLS_FETCH();
-
        zend_hash_destroy(ORA(conns));
        free(ORA(conns));
-
        return SUCCESS;
 }
 /* }}} */
@@ -1570,7 +1567,6 @@ PHP_FUNCTION(ora_errorcode)
  */
 PHP_MINFO_FUNCTION(oracle)
 {
-
        php_info_print_table_start();
        php_info_print_table_row(2, "Oracle Support", "enabled");
 #ifndef PHP_WIN32

diff --git a/ext/pfpro/pfpro.c b/ext/pfpro/pfpro.c
index e477ca92f481d42fa20d09266bcebafb330f3d39..a06e6b75d622c179643d28705bcc8463cf7979cb 100644 (file)
--- a/ext/pfpro/pfpro.c
+++ b/ext/pfpro/pfpro.c
@@ -107,8 +107,6 @@ PHP_RINIT_FUNCTION(pfpro)
 
 PHP_RSHUTDOWN_FUNCTION(pfpro)
 {
-       TSRMLS_FETCH();
-
        if (PFPROG(initialized) == 1) {
                pfproCleanup();
        }

diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c
index a83b564cd1ebdf4731f70984524a75e5e47b1c8b..0001adf52cc3af52fd98ca1a30c9838ab80f436a 100644 (file)
--- a/ext/pgsql/pgsql.c
+++ b/ext/pgsql/pgsql.c
@@ -293,7 +293,6 @@ PHP_RINIT_FUNCTION(pgsql)
  */
 PHP_RSHUTDOWN_FUNCTION(pgsql)
 {
-       TSRMLS_FETCH();
        zend_hash_apply(&EG(persistent_list), (apply_func_t) _rollback_transactions);
        return SUCCESS;
 }
@@ -304,7 +303,6 @@ PHP_RSHUTDOWN_FUNCTION(pgsql)
 PHP_MINFO_FUNCTION(pgsql)
 {
        char buf[32];
-       TSRMLS_FETCH();
 
        php_info_print_table_start();
        php_info_print_table_header(2, "PostgreSQL Support", "enabled");

diff --git a/ext/qtdom/qtdom.c b/ext/qtdom/qtdom.c
index 0f0e002e29d8a53e380f649625e7905d54ab2364..390f1688d87e1364b91ce319e04a7d562853671d 100644 (file)
--- a/ext/qtdom/qtdom.c
+++ b/ext/qtdom/qtdom.c
@@ -91,7 +91,6 @@ PHP_MINIT_FUNCTION(qtdom)
 PHP_MSHUTDOWN_FUNCTION(qtdom)
 {
     qdom_shutdown();
-
        return SUCCESS;
 }
 /* }}} */

diff --git a/ext/recode/recode.c b/ext/recode/recode.c
index 0833e49a93b1de0bdf7c5a6b5ba7c5e85f730e27..f9261c9d6e34223a75d4fc91cdcd80a6c0910be5 100644 (file)
--- a/ext/recode/recode.c
+++ b/ext/recode/recode.c
@@ -84,19 +84,15 @@ PHP_MINIT_FUNCTION(recode)
 
 PHP_MSHUTDOWN_FUNCTION(recode)
 {
-       TSRMLS_FETCH();
-
-       if (ReSG(outer))
+       if (ReSG(outer)) {
                recode_delete_outer(ReSG(outer));
-
+       }
        return SUCCESS;
 }
 
 
 PHP_MINFO_FUNCTION(recode)
 {
-       TSRMLS_FETCH();
-
        php_info_print_table_start();
        php_info_print_table_row(2, "Recode Support", "enabled");
        php_info_print_table_row(2, "Revision", "$Revision$");

diff --git a/ext/rpc/com/com_wrapper.c b/ext/rpc/com/com_wrapper.c
index c10865cdd85e555556653df81ffe3c7ce92bc2de..ddd3a4a7ae13a6ac9c3441b07fa3673934557f0c 100644 (file)
--- a/ext/rpc/com/com_wrapper.c
+++ b/ext/rpc/com/com_wrapper.c
@@ -352,7 +352,6 @@ static PHP_INI_MH(OnTypelibFileChange)
        char *typelib_name_buffer;
        char *strtok_buf = NULL;
        int interactive;
-       TSRMLS_FETCH();
 
        interactive = CG(interactive);
 

diff --git a/ext/rpc/java/java.c b/ext/rpc/java/java.c
index 61af18ff359839f09f447aeea76f7450fa8fceda..fd9d77b2ae93d2164e5ef6ad0b2c9904d9d2061e 100644 (file)
--- a/ext/rpc/java/java.c
+++ b/ext/rpc/java/java.c
@@ -106,10 +106,11 @@ php_java_globals java_globals;
 
 static zend_class_entry java_class_entry;
 
-static PHP_INI_MH(OnIniUpdate) {
-  if (new_value) *(char**)mh_arg1 = new_value;
-  iniUpdated=1;
-  return SUCCESS;
+static PHP_INI_MH(OnIniUpdate)
+{
+       if (new_value) *(char**)mh_arg1 = new_value;
+       iniUpdated=1;
+       return SUCCESS;
 }
 
 PHP_INI_BEGIN()

diff --git a/ext/sablot/sablot.c b/ext/sablot/sablot.c
index ad5c807fb8663c40656561c1bdc0151caa4812b9..88c909b2d60019cdbcb6b11c2d303f0eea4e4026 100644 (file)
--- a/ext/sablot/sablot.c
+++ b/ext/sablot/sablot.c
@@ -239,22 +239,16 @@ PHP_MINIT_FUNCTION(sablot)
 
 PHP_MSHUTDOWN_FUNCTION(sablot)
 {
-       TSRMLS_FETCH();
-
        if (SABLOTG(processor)) {
                SablotUnregHandler(SABLOTG(processor), HLR_MESSAGE, NULL, NULL);
                SablotDestroyProcessor(SABLOTG(processor));
        }
-
     return SUCCESS;
 }
 
 PHP_RSHUTDOWN_FUNCTION(sablot)
 {
-       TSRMLS_FETCH();
-
        SABLOT_FREE_ERROR_HANDLE(SABLOTG_HANDLE);
-
        return SUCCESS;
 }
 

diff --git a/ext/satellite/php_orbit.c b/ext/satellite/php_orbit.c
index 6b740b9f82892fcdfdcb4dc8064ff4e7aec072eb..41bb0e06b777b85735017504c7351644eb30ad97 100644 (file)
--- a/ext/satellite/php_orbit.c
+++ b/ext/satellite/php_orbit.c
@@ -80,14 +80,14 @@ static function_entry satellite_functions[] = {
  * module entry
  */
 zend_module_entry satellite_module_entry = {
-  "satellite",
-  satellite_functions,
-  PHP_MINIT(satellite),                        /* module startup */
-  PHP_MSHUTDOWN(satellite),    /* module shutdown */
-  NULL,                                                                                        /* request startup */
-  NULL,                                                                                        /* request shutdown */
-  PHP_MINFO(satellite),                        /* module info */
-  STANDARD_MODULE_PROPERTIES
+       "satellite",
+       satellite_functions,
+       PHP_MINIT(satellite),                   /* module startup */
+       PHP_MSHUTDOWN(satellite),       /* module shutdown */
+       NULL,                                                                                   /* request startup */
+       NULL,                                                                                   /* request shutdown */
+       PHP_MINFO(satellite),                   /* module info */
+       STANDARD_MODULE_PROPERTIES
 };
 
 /*
@@ -115,10 +115,8 @@ PHP_MINIT_FUNCTION(satellite)
 PHP_MSHUTDOWN_FUNCTION(satellite)
 {
        TypeManager_Shutdown();
-       orbit_corba_shutdown();
-       
+       orbit_corba_shutdown(); 
        UNREGISTER_INI_ENTRIES();
-       
        return SUCCESS;
 }
 
@@ -132,7 +130,7 @@ PHP_MINFO_FUNCTION(satellite)
        php_info_print_table_header(2, "CORBA support via Satellite", "enabled");
        php_info_print_table_end();
 
-  DISPLAY_INI_ENTRIES();
+       DISPLAY_INI_ENTRIES();
 }
 
 /* instruct the type manager to load an IDL file if not already loaded */

diff --git a/ext/session/session.c b/ext/session/session.c
index 72b66e72832d44e2c5749a41878344078faf7442..1212cefb2a2f96c27d5d8665fbf20a4486768234 100644 (file)
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@ -85,8 +85,6 @@ static const ps_serializer *_php_find_ps_serializer(char *name TSRMLS_DC);
 
 static PHP_INI_MH(OnUpdateSaveHandler)
 {
-       TSRMLS_FETCH();
-       
        PS(mod) = _php_find_ps_module(new_value TSRMLS_CC);
        if(!PS(mod)) {
          php_error(E_ERROR,"Cannot find save handler %s",new_value);
@@ -97,8 +95,6 @@ static PHP_INI_MH(OnUpdateSaveHandler)
 
 static PHP_INI_MH(OnUpdateSerializer)
 {
-       TSRMLS_FETCH();
-
        PS(serializer) = _php_find_ps_serializer(new_value TSRMLS_CC);
        if(!PS(serializer)) {
          php_error(E_ERROR,"Cannot find serialization handler %s",new_value);
@@ -1404,8 +1400,6 @@ PHP_FUNCTION(session_write_close)
 
 PHP_RSHUTDOWN_FUNCTION(session)
 {
-       TSRMLS_FETCH();
-
        php_session_flush(TSRMLS_C);
        php_rshutdown_session_globals(TSRMLS_C);
        return SUCCESS;
@@ -1436,7 +1430,6 @@ PHP_MSHUTDOWN_FUNCTION(session)
 
 PHP_MINFO_FUNCTION(session)
 {
-
        php_info_print_table_start();
        php_info_print_table_row(2, "Session Support", "enabled" );
        php_info_print_table_end();

diff --git a/ext/skeleton/skeleton.c b/ext/skeleton/skeleton.c
index 0889e47696cde40e16d4fa11daf1881e182fe1f0..9ad9cb04c91339bc41ec73ea77f82b0d49f2faee 100644 (file)
--- a/ext/skeleton/skeleton.c
+++ b/ext/skeleton/skeleton.c
@@ -59,9 +59,6 @@ PHP_INI_END()
  */
 PHP_MINIT_FUNCTION(extname)
 {
-/* Remove comments if you have entries in php.ini
-       REGISTER_INI_ENTRIES();
-*/
        return SUCCESS;
 }
 /* }}} */
@@ -70,9 +67,6 @@ PHP_MINIT_FUNCTION(extname)
  */
 PHP_MSHUTDOWN_FUNCTION(extname)
 {
-/* Remove comments if you have entries in php.ini
-       UNREGISTER_INI_ENTRIES();
-*/
        return SUCCESS;
 }
 /* }}} */

diff --git a/ext/standard/assert.c b/ext/standard/assert.c
index 74486b60ac20f96487e111dcd1d36459fc2693f7..fe018ffb67ae20a0094a6bd6533b3de48c8c014a 100644 (file)
--- a/ext/standard/assert.c
+++ b/ext/standard/assert.c
@@ -52,8 +52,6 @@ enum {
 
 static PHP_INI_MH(OnChangeCallback)
 {
-       TSRMLS_FETCH();
-                
        if (ASSERTG(callback)) {
                zval_ptr_dtor(&ASSERTG(callback));
        } else {
@@ -102,8 +100,6 @@ PHP_MINIT_FUNCTION(assert)
 
 PHP_MSHUTDOWN_FUNCTION(assert)
 {
-       TSRMLS_FETCH();
-
        if (ASSERTG(callback)) {
                zval_ptr_dtor(&ASSERTG(callback));
        }
@@ -112,8 +108,6 @@ PHP_MSHUTDOWN_FUNCTION(assert)
 
 PHP_RSHUTDOWN_FUNCTION(assert)
 {
-       TSRMLS_FETCH();
-
        if (ASSERTG(callback)) { 
                zval_ptr_dtor(&ASSERTG(callback));
                ASSERTG(callback) = NULL;

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 79ba88974be64170e8628329f1a85d7dda1992c9..82d4e7787eea8cd0bd7b4c3c2a73dbf1dd1f1376 100644 (file)
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -618,7 +618,6 @@ static PHP_INI_MH(OnUpdateSafeModeProtectedEnvVars)
        char *protected_vars, *protected_var;
        char *token_buf;
        int dummy=1;
-       TSRMLS_FETCH();
 
        protected_vars = estrndup(new_value, new_value_length);
        zend_hash_clean(&BG(sm_protected_env_vars));
@@ -635,8 +634,6 @@ static PHP_INI_MH(OnUpdateSafeModeProtectedEnvVars)
 
 static PHP_INI_MH(OnUpdateSafeModeAllowedEnvVars)
 {
-       TSRMLS_FETCH();
-
        if (BG(sm_allowed_env_vars)) {
                free(BG(sm_allowed_env_vars));
        }
@@ -799,9 +796,6 @@ PHP_MINIT_FUNCTION(basic)
 
 PHP_MSHUTDOWN_FUNCTION(basic)
 {
-       TSRMLS_FETCH();
-
-
 #ifdef ZTS
        ts_free_id(basic_globals_id);
 #else
@@ -878,8 +872,6 @@ PHP_RINIT_FUNCTION(basic)
 
 PHP_RSHUTDOWN_FUNCTION(basic)
 {
-       TSRMLS_FETCH();
-
        STR_FREE(BG(strtok_string));
        BG(strtok_string) = NULL;
 #ifdef HAVE_PUTENV

diff --git a/ext/standard/dl.c b/ext/standard/dl.c
index 498eddc7992fef194ccbf24dfd66f2be740d13ac..ae743dce24f07a39701899be85854bc087aa96d3 100644 (file)
--- a/ext/standard/dl.c
+++ b/ext/standard/dl.c
@@ -203,7 +203,7 @@ void php_dl(pval *file, int type, pval *return_value)
 
 PHP_MINFO_FUNCTION(dl)
 {
-        php_info_print_table_row(2, "Dynamic Library Support", "enabled");
+       php_info_print_table_row(2, "Dynamic Library Support", "enabled");
 }
 
 #else

diff --git a/ext/standard/file.c b/ext/standard/file.c
index d2d076343fd64e2e3b2eee37715119039076efc0..a01946cf1d6f8b3da47ca15887a7957884d37cd7 100644 (file)
--- a/ext/standard/file.c
+++ b/ext/standard/file.c
@@ -219,8 +219,6 @@ PHP_MINIT_FUNCTION(file)
 PHP_MSHUTDOWN_FUNCTION(file)
 {
 #ifndef ZTS
-       TSRMLS_FETCH();
-
        file_globals_dtor(&file_globals TSRMLS_CC);
 #endif
        return SUCCESS;

diff --git a/ext/standard/filestat.c b/ext/standard/filestat.c
index 227846328bd36ae742c1dd35205f8d1744f7999a..4cc224b81f1c32dfacf0f3acfae9ed2fd23f9691 100644 (file)
--- a/ext/standard/filestat.c
+++ b/ext/standard/filestat.c
@@ -96,8 +96,6 @@ PHP_RINIT_FUNCTION(filestat)
 
 PHP_RSHUTDOWN_FUNCTION(filestat)
 {
-       TSRMLS_FETCH();
-
        if (BG(CurrentStatFile)) {
                efree (BG(CurrentStatFile));
        }

diff --git a/ext/standard/fsock.c b/ext/standard/fsock.c
index d42e984de138c30a16aa1f0c6df62a9882fdc793..0f321ff08e0051ca3e6f5c27a8600917764aa628 100644 (file)
--- a/ext/standard/fsock.c
+++ b/ext/standard/fsock.c
@@ -752,8 +752,6 @@ PHPAPI void php_msock_destroy(int *data)
 
 PHP_RSHUTDOWN_FUNCTION(fsock)
 {
-       TSRMLS_FETCH();
-
        php_cleanup_sockbuf(0 TSRMLS_CC);
        return SUCCESS;
 }

diff --git a/ext/standard/info.c b/ext/standard/info.c
index fa1fef823e00e999629497b28914ec37b6ad93c2..ba84c689a05b901e56b73f11b6633d1d4f650249 100644 (file)
--- a/ext/standard/info.c
+++ b/ext/standard/info.c
@@ -42,10 +42,11 @@ PHPAPI extern char *php_ini_opened_path;
 static int _display_module_info(zend_module_entry *module, void *arg)
 {
        int show_info_func = *((int *) arg);
+       TSRMLS_FETCH();
 
        if (show_info_func && module->info_func) {
                php_printf("<h2 align=\"center\"><a name=\"module_%s\">%s</a></h2>\n", module->name, module->name);
-               module->info_func(module);
+               module->info_func(module TSRMLS_CC);
        } else if (!show_info_func && !module->info_func) {
                php_printf("<tr valign=\"baseline\" bgcolor=\"" PHP_CONTENTS_COLOR "\">");
                php_printf("<td>");

diff --git a/ext/standard/mail.c b/ext/standard/mail.c
index 406a219b66f2a27edebba055ca903c8c64645e32..3e37ca8336dd8cb0f2ed480f7f98920df7083b26 100644 (file)
--- a/ext/standard/mail.c
+++ b/ext/standard/mail.c
@@ -208,13 +208,17 @@ PHPAPI int php_mail(char *to, char *subject, char *message, char *headers, char
  */
 PHP_MINFO_FUNCTION(mail)
 {
-#ifdef PHP_WIN32
        char *sendmail_path = INI_STR("sendmail_path");
-       if (!sendmail_path) 
-        php_info_print_table_row(2, "Internal Sendmail Support for Windows 4", "enabled");
-       else
+
+#ifdef PHP_WIN32
+       if (!sendmail_path) {
+        php_info_print_table_row(2, "Internal Sendmail Support for Windows", "enabled");
+       } else {
+        php_info_print_table_row(2, "Path to sendmail", sendmail_path);
+       }
+#else
+    php_info_print_table_row(2, "Path to sendmail", sendmail_path);
 #endif
-        php_info_print_table_row(2, "Path to sendmail", INI_STR("sendmail_path") );
 }
 /* }}} */
 

diff --git a/ext/standard/reg.c b/ext/standard/reg.c
index 63344b8878c35f879bee27fd6600271f07913495..7ffb343a7635cf36fcfb1e34bf698971b764c417 100644 (file)
--- a/ext/standard/reg.c
+++ b/ext/standard/reg.c
@@ -102,8 +102,6 @@ PHP_MINIT_FUNCTION(regex)
 
 PHP_MSHUTDOWN_FUNCTION(regex)
 {
-       TSRMLS_FETCH();
-
        zend_hash_destroy(&REG(ht_rc));
        return SUCCESS;
 }

diff --git a/ext/standard/string.c b/ext/standard/string.c
index 89014fecc08cc96551ada5867b5f39b32c4d9957..ffcfbd2c0ba3c4366021c2b19b0aac4e98884254 100644 (file)
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@ -160,9 +160,7 @@ PHP_MINIT_FUNCTION(localeconv)
 PHP_MSHUTDOWN_FUNCTION(localeconv)
 {
        tsrm_mutex_free( locale_mutex );
-
        locale_mutex = NULL;
-
        return SUCCESS;
 }
 /* }}} */

diff --git a/ext/standard/syslog.c b/ext/standard/syslog.c
index 0defb80b37a220d685eacb53a19e64d74f230f49..594891ed5b5e7ef4a8df8813c414b0f0ac921240 100644 (file)
--- a/ext/standard/syslog.c
+++ b/ext/standard/syslog.c
@@ -116,8 +116,6 @@ PHP_RINIT_FUNCTION(syslog)
 
 PHP_RSHUTDOWN_FUNCTION(syslog)
 {
-       TSRMLS_FETCH();
-       
        if (BG(syslog_device)) {
                efree(BG(syslog_device));
        }

diff --git a/ext/standard/url_scanner_ex.c b/ext/standard/url_scanner_ex.c
index b4c9dafecc15e5facb9cc6a8e7686d66e8701f88..10abc5450678c9461da33280b47a1ce7135c244a 100644 (file)
--- a/ext/standard/url_scanner_ex.c
+++ b/ext/standard/url_scanner_ex.c
@@ -47,7 +47,6 @@ static PHP_INI_MH(OnUpdateTags)
        char *key;
        char *lasts;
        char *tmp;
-       TSRMLS_FETCH();
        
        ctx = &BG(url_adapt_state_ex);
        
@@ -874,7 +873,6 @@ PHP_RINIT_FUNCTION(url_scanner)
 PHP_RSHUTDOWN_FUNCTION(url_scanner)
 {
        url_adapt_state_ex_t *ctx;
-       TSRMLS_FETCH();
        
        ctx = &BG(url_adapt_state_ex);
 
@@ -901,8 +899,6 @@ PHP_MINIT_FUNCTION(url_scanner)
 
 PHP_MSHUTDOWN_FUNCTION(url_scanner)
 {
-       TSRMLS_FETCH();
-
        UNREGISTER_INI_ENTRIES();
        zend_hash_destroy(BG(url_adapt_state_ex).tags);
        free(BG(url_adapt_state_ex).tags);

diff --git a/ext/sybase/php_sybase_db.c b/ext/sybase/php_sybase_db.c
index 1cfbf8073e2602e99f6da8299da96872b658c122..72c357ce232908d99302230527c49086cf945193 100644 (file)
--- a/ext/sybase/php_sybase_db.c
+++ b/ext/sybase/php_sybase_db.c
@@ -1306,7 +1306,7 @@ PHP_FUNCTION(sybase_affected_rows)
 
 PHP_MINFO_FUNCTION(sybase)
 {
-       char maxp[32],maxl[32];
+       char maxp[32], maxl[32];
        
        if (php_sybase_module.max_persistent==-1) {
                snprintf(maxp, 31, "%ld/unlimited", php_sybase_module.num_persistent );

diff --git a/ext/sybase_ct/php_sybase_ct.c b/ext/sybase_ct/php_sybase_ct.c
index a0b144f0c6541c9534f747cc158c7ed237a7a292..f9e02110fcab8818e9a2a61e1872d485585c7f1b 100644 (file)
--- a/ext/sybase_ct/php_sybase_ct.c
+++ b/ext/sybase_ct/php_sybase_ct.c
@@ -367,8 +367,6 @@ PHP_MSHUTDOWN_FUNCTION(sybase)
 
 PHP_RSHUTDOWN_FUNCTION(sybase)
 {
-       TSRMLS_FETCH();
-
        efree(SybCtG(appname));
        STR_FREE(SybCtG(server_message));
        return SUCCESS;
@@ -1652,7 +1650,6 @@ PHP_FUNCTION(sybase_affected_rows)
 PHP_MINFO_FUNCTION(sybase)
 {
        char buf[32];
-       TSRMLS_FETCH();
        
        php_info_print_table_start();
        php_info_print_table_header(2, "Sybase_CT Support", "enabled" );

diff --git a/ext/vpopmail/php_vpopmail.c b/ext/vpopmail/php_vpopmail.c
index 4336ff84c6cd7e006cfd917c8cf0cbfaa8a19d6f..291edcae234bb3185d61a2cec95dcbefcdc8f244 100644 (file)
--- a/ext/vpopmail/php_vpopmail.c
+++ b/ext/vpopmail/php_vpopmail.c
@@ -137,12 +137,9 @@ void vclose();
 
 PHP_RSHUTDOWN_FUNCTION(vpopmail)
 {
-       TSRMLS_FETCH();
-
        if (VPOPMAILG(vpopmail_open) != 0) {
                vclose();
        }
-
        return SUCCESS;
 }
 

diff --git a/ext/xml/xml.c b/ext/xml/xml.c
index e5de0af07f3529930be1cbc998f98d7d2d0145a1..88798c82f6d935b271cbb75542343c84c2cab5c1 100644 (file)
--- a/ext/xml/xml.c
+++ b/ext/xml/xml.c
@@ -229,12 +229,11 @@ PHP_RSHUTDOWN_FUNCTION(xml)
 
 PHP_MINFO_FUNCTION(xml)
 {
-
-        php_info_print_table_start();
-               php_info_print_table_row(2, "XML Support", "active");
-               php_info_print_table_row(2, "XML Namespace Support", "active");
-               php_info_print_table_row(2, "EXPAT Version",XML_ExpatVersion());
-        php_info_print_table_end();
+       php_info_print_table_start();
+       php_info_print_table_row(2, "XML Support", "active");
+       php_info_print_table_row(2, "XML Namespace Support", "active");
+       php_info_print_table_row(2, "EXPAT Version",XML_ExpatVersion());
+       php_info_print_table_end();
 }
 /* }}} */
 

diff --git a/ext/yp/yp.c b/ext/yp/yp.c
index 1dd3d3d16243c7bc949d9843bee7737b9136f333..fa588260df6176873432ae3ed8c618448f300a48 100644 (file)
--- a/ext/yp/yp.c
+++ b/ext/yp/yp.c
@@ -394,7 +394,8 @@ PHP_RINIT_FUNCTION(yp)
        YP(error) = 0;
 }
 
-PHP_MINFO_FUNCTION(yp) {
+PHP_MINFO_FUNCTION(yp)
+{
        php_info_print_table_start();
        php_info_print_table_row(2, "YP Support", "enabled");
        php_info_print_table_end();

diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c
index 9f997ed38c871fcaf9aa48b18b43556d137fa95d..4981d5ce98696083d263af39b4e35148531e4310 100644 (file)
--- a/ext/zlib/zlib.c
+++ b/ext/zlib/zlib.c
@@ -204,8 +204,6 @@ PHP_RINIT_FUNCTION(zlib)
 PHP_MSHUTDOWN_FUNCTION(zlib)
 {
 #if HAVE_FOPENCOOKIE
-       TSRMLS_FETCH();
-
        if(PG(allow_url_fopen)) {
            php_unregister_url_wrapper("zlib"); 
     }

diff --git a/main/main.c b/main/main.c
index 20bf73977f9cf1ad0bb179d6efc29a56e93a485a..92dcd6a4d2a809e738175a15665e0e5e56942063 100644 (file)
--- a/main/main.c
+++ b/main/main.c
@@ -91,8 +91,6 @@ static void php_build_argv(char *s, zval *track_vars_array TSRMLS_DC);
  */
 static PHP_INI_MH(OnSetPrecision)
 {
-       TSRMLS_FETCH();
-
        EG(precision) = atoi(new_value);
        return SUCCESS;
 }
@@ -119,8 +117,6 @@ static PHP_INI_MH(OnChangeMemoryLimit)
  */
 static PHP_INI_MH(OnUpdateErrorReporting)
 {
-       TSRMLS_FETCH();
-
        if (!new_value) {
                EG(error_reporting) = E_ALL & ~E_NOTICE;
        } else {
@@ -151,8 +147,6 @@ static void php_disable_functions()
  */
 static PHP_INI_MH(OnUpdateTimeout)
 {
-       TSRMLS_FETCH();
-
        EG(timeout_seconds) = atoi(new_value);
        if (stage==PHP_INI_STAGE_STARTUP) {
                /* Don't set a timeout on startup, only per-request */

diff --git a/sapi/apache/php_apache.c b/sapi/apache/php_apache.c
index dc746cc5c76f703fe425b3a247add83d5a41f49e..021346a2411cdfbaa5a6d353f4f445d2d97f39b6 100644 (file)
--- a/sapi/apache/php_apache.c
+++ b/sapi/apache/php_apache.c
@@ -182,7 +182,6 @@ PHP_MINFO_FUNCTION(apache)
        extern char *user_name;
        extern gid_t group_id;
        extern int max_requests_per_child;
-       TSRMLS_FETCH();
 
        serv = ((request_rec *) SG(server_context))->server;