Changeset 669

Timestamp:

2009-08-07T04:31:12+02:00 (4 years ago)

Author:

moo

Message:

use XCACHE_ERROR_CACHING macro to simplify ifdefs

Location:

trunk

Files:

• utils.c (modified) (6 diffs)
• utils.h (modified) (2 diffs)
• xcache.c (modified) (2 diffs)

trunk/utils.c

@@ -530 +530 @@
 #define OG(x) (sandbox->orig_##x)
 /* }}} */
-#if defined(E_STRICT) || defined(E_DEPRECATED)
+#ifdef XCACHE_ERROR_CACHING
 static void xc_sandbox_error_cb(int type, const char *error_filename, const uint error_lineno, const char *format, va_list args) /* {{{ */
 {
@@ -540 +540 @@
     assert(sandbox != NULL);
     switch (type) {
-#ifdef E_STRICT:
+#ifdef E_STRICT
     case E_STRICT:
 #endif
@@ -740 +740 @@
     sandbox->filename = filename;
 
-#ifdef E_STRICT
+#ifdef XCACHE_ERROR_CACHING
     sandbox->orig_user_error_handler_error_reporting = EG(user_error_handler_error_reporting);
     EG(user_error_handler_error_reporting) = 0;
@@ -823 +823 @@
     }
 
-#ifdef E_STRICT
+#ifdef XCACHE_ERROR_CACHING
     /* restore trigger errors */
     for (i = 0; i < sandbox->compilererror_cnt; i ++) {
@@ -840 +840 @@
 {
     XG(sandbox) = NULL;
-#ifdef E_STRICT
+#ifdef XCACHE_ERROR_CACHING
     EG(user_error_handler_error_reporting) = sandbox->orig_user_error_handler_error_reporting;
     zend_error_cb = sandbox->orig_zend_error_cb;
@@ -886 +886 @@
     memcpy(&EG(included_files), &OG(included_files), sizeof(EG(included_files)));
 
-#ifdef E_STRICT
+#ifdef XCACHE_ERROR_CACHING
     if (sandbox->compilererrors) {
         zend_uint i;

trunk/utils.h

@@ -74 +74 @@
 ZESW(xc_cest_t *, void) xc_install_class(char *filename, xc_cest_t *cest, int oplineno, zend_uchar type, zstr key, uint len, ulong h TSRMLS_DC);
 
+#if defined(E_STRICT) || defined(E_DEPRECATED)
+#define XCACHE_ERROR_CACHING
+#endif
+
 /* sandbox */
 typedef struct {
@@ -98 +102 @@
     Bucket    *tmp_internal_class_tail;
 
-#if defined(E_STRICT) || defined(E_DEPRECATED)
+#ifdef XCACHE_ERROR_CACHING
     int orig_user_error_handler_error_reporting;
     void (*orig_zend_error_cb)(int type, const char *error_filename, const uint error_lineno, const char *format, va_list args);

trunk/xcache.c

@@ -756 +756 @@
     }
 #endif
-#ifdef E_STRICT
+#ifdef XCACHE_ERROR_CACHING
     /* restore trigger errors */
     for (i = 0; i < p->compilererror_cnt; i ++) {
@@ -1536 +1536 @@
 #undef X_FREE_UNUSED
     /* }}} */
-#ifdef E_STRICT
+#ifdef XCACHE_ERROR_CACHING
     php->compilererrors = ((xc_sandbox_t *) XG(sandbox))->compilererrors;
     php->compilererror_cnt = ((xc_sandbox_t *) XG(sandbox))->compilererror_cnt;