[PHP-CVS] cvs: php-src /ext/standard var_unserializer.re

[Jani Taskinen]

jani            Mon Aug  6 18:20:30 2007 UTC

  Modified files:              
    /php-src/ext/standard       var_unserializer.re 
  Log:
  MFB: fix compile warning (+ some ws fixes)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/var_unserializer.re?r1=1.67&r2=1.68&diff_format=u
Index: php-src/ext/standard/var_unserializer.re
diff -u php-src/ext/standard/var_unserializer.re:1.67 
php-src/ext/standard/var_unserializer.re:1.68
--- php-src/ext/standard/var_unserializer.re:1.67       Mon Jul  9 15:58:52 2007
+++ php-src/ext/standard/var_unserializer.re    Mon Aug  6 18:20:30 2007
@@ -16,7 +16,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: var_unserializer.re,v 1.67 2007/07/09 15:58:52 dmitry Exp $ */
+/* $Id: var_unserializer.re,v 1.68 2007/08/06 18:20:30 jani Exp $ */
 
 #include "php.h"
 #include "ext/standard/php_var.h"
@@ -116,7 +116,7 @@
        char *str = safe_emalloc(*len, 1, 1);
        unsigned char *end = *(unsigned char **)p+maxlen;
 
-       if(end < *p) {
+       if (end < *p) {
                efree(str);
                return NULL;
        }
@@ -366,7 +366,7 @@
        zstr buf;
        size_t buf_len;
 
-       if(ce->unserialize == NULL) {
+       if (ce->unserialize == NULL) {
                zend_error(E_WARNING, "Class %v has no unserializer", ce->name);
                return 0;
        }
@@ -390,8 +390,8 @@
                return 0;
        }
           
-       if(datalen < 0 || (*p) + datalen >= max) {
-               zend_error(E_WARNING, "Insufficient data for unserializing - 
%ld required, %d present", datalen, max - (*p));
+       if (datalen < 0 || (*p) + datalen >= max) {
+               zend_error(E_WARNING, "Insufficient data for unserializing - 
%ld required, %ld present", datalen, max - (*p));
                return 0;
        }
 
@@ -403,7 +403,7 @@
                buf_len = datalen;
                (*p) += datalen;
        }
-       if(ce->unserialize(rval, ce, type, buf, buf_len, (zend_unserialize_data 
*)var_hash TSRMLS_CC) != SUCCESS) {
+       if (ce->unserialize(rval, ce, type, buf, buf_len, 
(zend_unserialize_data *)var_hash TSRMLS_CC) != SUCCESS) {
                if (type == IS_UNICODE) {
                        efree(buf.v);
                }
@@ -687,7 +687,7 @@
        zval **args[1];
        zval *arg_func_name;
 
-       if(*start == 'C') {
+       if (*start == 'C') {
                custom_object = 1;
        }
        
@@ -770,7 +770,7 @@
 
        *p = YYCURSOR;
 
-       if(custom_object) {
+       if (custom_object) {
                efree(class_name.v);
                return object_custom(UNSERIALIZE_PASSTHRU, ce);
        }

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