com php-src: Indent (not sure why it was messed): ext/standard/ var_unserializer.c ext/standard/var_unserializer.re
| From: | Anatol Belski | Date: | Wed, 25 Nov 2015 02:17:13 +0000 |
| Subject: | com php-src: Indent (not sure why it was messed): ext/standard/ var_unserializer.c ext/standard/var_unserializer.re | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-90012@lists.php.net to get a copy of this message | ||
Commit: 57251853e788df4c75ba4727da51ef493def7fd9
Author: Xinchen Hui <laruence@gmail.com> Tue, 24 Nov 2015 11:08:30 +0800
Committer: Anatol Belski <ab@php.net> Wed, 25 Nov 2015 03:17:13 +0100
Parents: aa4747c407e07b8d0b297f44c4ea7835b76fd58d
Branches: PHP-7.0.0
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=57251853e788df4c75ba4727da51ef493def7fd9
Log:
Indent (not sure why it was messed)
Changed paths:
M ext/standard/var_unserializer.c
M ext/standard/var_unserializer.re
Diff:
diff --git a/ext/standard/var_unserializer.c b/ext/standard/var_unserializer.c
index f4c2b32..3284ad3 100644
--- a/ext/standard/var_unserializer.c
+++ b/ext/standard/var_unserializer.c
@@ -1289,16 +1289,16 @@ yy97:
zval_ptr_dtor(rval);
if (Z_ISREF_P(rval_ref)) {
- if (!Z_ISUNDEF_P(Z_REFVAL_P(rval_ref))) {
- ZVAL_COPY(rval, rval_ref);
- } else {
- ZVAL_UNDEF(rval);
- }
+ if (!Z_ISUNDEF_P(Z_REFVAL_P(rval_ref))) {
+ ZVAL_COPY(rval, rval_ref);
+ } else {
+ ZVAL_UNDEF(rval);
+ }
} else if (Z_ISUNDEF_P(rval_ref)) {
- ZVAL_UNDEF(rval);
+ ZVAL_UNDEF(rval);
} else {
- ZVAL_NEW_REF(rval_ref, rval_ref);
- ZVAL_COPY(rval, rval_ref);
+ ZVAL_NEW_REF(rval_ref, rval_ref);
+ ZVAL_COPY(rval, rval_ref);
}
return 1;
diff --git a/ext/standard/var_unserializer.re b/ext/standard/var_unserializer.re
index 0ebca3d..d652d33 100644
--- a/ext/standard/var_unserializer..re
+++ b/ext/standard/var_unserializer.re
@@ -523,16 +523,16 @@ PHPAPI int php_var_unserialize_ex(UNSERIALIZE_PARAMETER)
zval_ptr_dtor(rval);
if (Z_ISREF_P(rval_ref)) {
- if (!Z_ISUNDEF_P(Z_REFVAL_P(rval_ref))) {
- ZVAL_COPY(rval, rval_ref);
- } else {
- ZVAL_UNDEF(rval);
- }
+ if (!Z_ISUNDEF_P(Z_REFVAL_P(rval_ref))) {
+ ZVAL_COPY(rval, rval_ref);
+ } else {
+ ZVAL_UNDEF(rval);
+ }
} else if (Z_ISUNDEF_P(rval_ref)) {
- ZVAL_UNDEF(rval);
+ ZVAL_UNDEF(rval);
} else {
- ZVAL_NEW_REF(rval_ref, rval_ref);
- ZVAL_COPY(rval, rval_ref);
+ ZVAL_NEW_REF(rval_ref, rval_ref);
+ ZVAL_COPY(rval, rval_ref);
}
return 1;