From 1ba55bc12b1d2bf63d5698fc76df7ea5daf04188 Mon Sep 17 00:00:00 2001
From: Matt Nowack <mdnowack@gmail.com>
Date: Mon, 19 Mar 2012 15:29:55 -0700
Subject: [PATCH 1/2] Adding some braces, braces are win
---
ext/json/json.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/ext/json/json.c b/ext/json/json.c
index fb0e2d8ca0013..fc1fcb7f1f5e6 100644
--- a/ext/json/json.c
+++ b/ext/json/json.c
@@ -174,8 +174,9 @@ static int json_determine_array_type(zval **val TSRMLS_DC) /* {{{ */
idx = 0;
for (;; zend_hash_move_forward_ex(myht, &pos)) {
i = zend_hash_get_current_key_ex(myht, &key, &key_len, &index, 0, &pos);
- if (i == HASH_KEY_NON_EXISTANT)
+ if (i == HASH_KEY_NON_EXISTANT) {
break;
+ }
if (i == HASH_KEY_IS_STRING) {
return 1;
From 8c66258c082fa040dd55102ed872c849c5504f14 Mon Sep 17 00:00:00 2001
From: Matt Nowack <mdnowack@gmail.com>
Date: Mon, 19 Mar 2012 15:29:55 -0700
Subject: [PATCH 2/2] Adding Braces in json.c to conform with coding standards
---
ext/json/json.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/ext/json/json.c b/ext/json/json.c
index fb0e2d8ca0013..fc1fcb7f1f5e6 100644
--- a/ext/json/json.c
+++ b/ext/json/json.c
@@ -174,8 +174,9 @@ static int json_determine_array_type(zval **val TSRMLS_DC) /* {{{ */
idx = 0;
for (;; zend_hash_move_forward_ex(myht, &pos)) {
i = zend_hash_get_current_key_ex(myht, &key, &key_len, &index, 0, &pos);
- if (i == HASH_KEY_NON_EXISTANT)
+ if (i == HASH_KEY_NON_EXISTANT) {
break;
+ }
if (i == HASH_KEY_IS_STRING) {
return 1;