[PHP-CVS] cvs: php-src /ext/standard var.c

[Antony Dovgal]

tony2001                Fri Jul 14 08:38:31 2006 UTC

  Modified files:              
    /php-src/ext/standard       var.c 
  Log:
  WS and CS fixes
  I suppose STR_FREE() is better than if(..) {efree (..);}
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/var.c?r1=1.237&r2=1.238&diff_format=u
Index: php-src/ext/standard/var.c
diff -u php-src/ext/standard/var.c:1.237 php-src/ext/standard/var.c:1.238
--- php-src/ext/standard/var.c:1.237    Fri Jul 14 08:29:06 2006
+++ php-src/ext/standard/var.c  Fri Jul 14 08:38:30 2006
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: var.c,v 1.237 2006/07/14 08:29:06 dmitry Exp $ */
+/* $Id: var.c,v 1.238 2006/07/14 08:38:30 tony2001 Exp $ */
 
 
 
@@ -1116,10 +1116,8 @@
                str = emalloc(buf_len+1);
                for (i = 0; i < buf_len; i++) {
                        if (buf.u[i] > 128) {
-                               php_error_docref(NULL TSRMLS_CC, E_NOTICE, 
"Error at offset %d of %d bytes", i, buf_len);                               
-                               if (str) {
-                                       efree(str);
-                               }
+                               php_error_docref(NULL TSRMLS_CC, E_NOTICE, 
"Error at offset %d of %d bytes", i, buf_len);
+                               STR_FREE(str);
                                RETURN_FALSE;
                        }
                        str[i] = buf.u[i];
@@ -1134,15 +1132,11 @@
                PHP_VAR_UNSERIALIZE_DESTROY(var_hash);
                zval_dtor(return_value);
                php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Error at offset %ld 
of %d bytes", (long)((char*)p - buf.s), buf_len);
-               if (str) {
-                       efree(str);
-               }
+               STR_FREE(str);
                RETURN_FALSE;
        }
        PHP_VAR_UNSERIALIZE_DESTROY(var_hash);
-       if (str) {
-               efree(str);
-       }
+       STR_FREE(str);
 }
 
 /* }}} */

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