[PHP-CVS] cvs: php-src /main main.c

[Wez Furlong]

wez             Mon Aug 18 23:25:00 2003 EDT

  Modified files:              
    /php-src/main       main.c 
  Log:
  Unify TSRMLS_FETCH() usage.
  Fix release build: two instances of } were placed inside #ifdef ZEND_DEBUG
  
  
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.565 php-src/main/main.c:1.566
--- php-src/main/main.c:1.565   Mon Aug 18 18:31:29 2003
+++ php-src/main/main.c Mon Aug 18 23:25:00 2003
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: main.c,v 1.565 2003/08/18 22:31:29 zeev Exp $ */
+/* $Id: main.c,v 1.566 2003/08/19 03:25:00 wez Exp $ */
 
 /* {{{ includes
  */
@@ -846,30 +846,24 @@
  */
 static void php_message_handler_for_zend(long message, void *data)
 {
+       TSRMLS_FETCH();
+
        switch (message) {
                case ZMSG_FAILED_INCLUDE_FOPEN: {
-                               TSRMLS_FETCH();
-
                                php_error_docref("function.include" TSRMLS_CC, 
E_WARNING, "Failed opening '%s' for inclusion (include_path='%s')", 
php_strip_url_passwd((char *) data), STR_PRINT(PG(include_path)));
                        }
                        break;
                case ZMSG_FAILED_REQUIRE_FOPEN: {
-                               TSRMLS_FETCH();
-
                                php_error_docref("function.require" TSRMLS_CC, 
E_COMPILE_ERROR, "Failed opening required '%s' (include_path='%s')", 
php_strip_url_passwd((char *) data), STR_PRINT(PG(include_path)));
                        }
                        break;
                case ZMSG_FAILED_HIGHLIGHT_FOPEN: {
-                               TSRMLS_FETCH();
-
                                php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed 
opening '%s' for highlighting", php_strip_url_passwd((char *) data));
                        }
                        break;
                case ZMSG_MEMORY_LEAK_DETECTED:
                case ZMSG_MEMORY_LEAK_REPEATED: {
 #if ZEND_DEBUG
-                               TSRMLS_FETCH();
-
                                if ((EG(error_reporting)&E_WARNING) && 
PG(report_memleaks)) {
                                        char memory_leak_buf[512];
 
@@ -895,13 +889,11 @@
                                        fprintf(stderr, "%s", memory_leak_buf);
 #      endif
                                }
-                       }
 #endif
+                       }
                        break;
                case ZMSG_MEMORY_LEAKS_GRAND_TOTAL: {
 #if ZEND_DEBUG
-                               TSRMLS_FETCH();
-
                                if ((EG(error_reporting)&E_WARNING) && 
PG(report_memleaks)) {
                                        char memory_leak_buf[512];
 
@@ -912,14 +904,13 @@
                                        fprintf(stderr, "%s", memory_leak_buf);
 #      endif
                                }
-                       }
 #endif
+                       }
                        break;
                case ZMSG_LOG_SCRIPT_NAME: {
                                struct tm *ta, tmbuf;
                                time_t curtime;
                                char *datetime_str, asctimebuf[52];
-                               TSRMLS_FETCH();
 
                                time(&curtime);
                                ta = php_localtime_r(&curtime, &tmbuf);



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php