[PHP-CVS] cvs: php4 /main main.c

[Jani Taskinen]

sniper          Sat Nov  9 21:48:22 2002 EDT

  Modified files:              
    /php4/main  main.c 
  Log:
  ws fixes
  
  
Index: php4/main/main.c
diff -u php4/main/main.c:1.509 php4/main/main.c:1.510
--- php4/main/main.c:1.509      Sat Nov  9 21:09:26 2002
+++ php4/main/main.c    Sat Nov  9 21:48:22 2002
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: main.c,v 1.509 2002/11/10 02:09:26 ssb Exp $ */
+/* $Id: main.c,v 1.510 2002/11/10 02:48:22 sniper Exp $ */
 
 /* {{{ includes
  */
@@ -406,7 +406,7 @@
        char *buffer = NULL, *docref_buf = NULL, *ref = NULL, *target = NULL;
        char *docref_target = "", *docref_root = "";
        char *function, *p;
-    int buffer_len = 0;
+       int buffer_len = 0;
        
        buffer_len = vspprintf(&buffer, 0, format, args);
        if (buffer) {
@@ -457,27 +457,29 @@
                        } else {
                                php_error(type, "%s(%s) [%s%s%s]: %s", 
get_active_function_name(TSRMLS_C), params, docref_root, docref, docref_target, 
buffer);
                        }
-                       if (target)
+                       if (target) {
                                efree(target);
-               } else {                                
+                       }
+               } else {
                        docref = get_active_function_name(TSRMLS_C);
                        if (!docref)
                                docref = "Unknown";
                        php_error(type, "%s(%s): %s", docref, params, buffer);
                }
-        if (PG(track_errors) && EG(active_symbol_table)) {
-            pval *tmp;
-            ALLOC_ZVAL(tmp);
-            INIT_PZVAL(tmp);
-            Z_STRVAL_P(tmp) = (char *) estrndup(buffer, buffer_len);
-            Z_STRLEN_P(tmp) = buffer_len;
-            Z_TYPE_P(tmp) = IS_STRING;
-            zend_hash_update(EG(active_symbol_table), "php_errormsg", 
sizeof("php_errormsg"), (void **) & tmp, sizeof(pval *), NULL);
-        }
+
+               if (PG(track_errors) && EG(active_symbol_table)) {
+                       zval *tmp;
+                       ALLOC_ZVAL(tmp);
+                       INIT_PZVAL(tmp);
+                       Z_STRVAL_P(tmp) = (char *) estrndup(buffer, buffer_len);
+                       Z_STRLEN_P(tmp) = buffer_len;
+                       Z_TYPE_P(tmp) = IS_STRING;
+                       zend_hash_update(EG(active_symbol_table), "php_errormsg", 
+sizeof("php_errormsg"), (void **) & tmp, sizeof(pval *), NULL);
+               }
                efree(buffer);
                if (docref_buf) {
                        efree(docref_buf);
-        }
+               }
        } else {
                php_error(E_ERROR, "%s(%s): Out of memory", 
get_active_function_name(TSRMLS_C), params);
        }



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