From 12f5dbd0009184b14f9ad3ebc5efd603352f042c Mon Sep 17 00:00:00 2001
From: Andrew Sidwell <andy@entai.co.uk>
Date: Sun, 3 Aug 2008 19:22:09 +0000
Subject: Remove some excessive indentation.

svn path=/trunk/hubbub/; revision=4881
---
 src/tokeniser/tokeniser.c | 50 ++++++++++++++++++++++-------------------------
 1 file changed, 23 insertions(+), 27 deletions(-)

diff --git a/src/tokeniser/tokeniser.c b/src/tokeniser/tokeniser.c
index 9a67b07..5dc3b4e 100644
--- a/src/tokeniser/tokeniser.c
+++ b/src/tokeniser/tokeniser.c
@@ -725,22 +725,22 @@ bool hubbub_tokeniser_handle_data(hubbub_tokeniser *tokeniser)
 			 * consumption */
 			break;
 
-		} else if (c == '-') {
-			if (tokeniser->escape_flag == false &&
-					(tokeniser->content_model ==
+		} else if (c == '-' &&
+				tokeniser->escape_flag == false &&
+				(tokeniser->content_model ==
 						HUBBUB_CONTENT_MODEL_RCDATA ||
-					tokeniser->content_model ==
+				tokeniser->content_model ==
 						HUBBUB_CONTENT_MODEL_CDATA) &&
-					tokeniser->context.chars.len >= 3) {
+				tokeniser->context.chars.len >= 3) {
 
-				cptr = parserutils_inputstream_peek(
-						tokeniser->input,
-						tokeniser->context.chars.len - 3,
-						&len);
+			cptr = parserutils_inputstream_peek(
+					tokeniser->input,
+					tokeniser->context.chars.len - 3,
+					&len);
 
-				if (strncmp((char *)cptr,
-						"<!--", SLEN("<!--")) == 0)
-					tokeniser->escape_flag = true;
+			if (strncmp((char *)cptr,
+					"<!--", SLEN("<!--")) == 0) {
+				tokeniser->escape_flag = true;
 			}
 
 			tokeniser->context.chars.len += len;
@@ -760,26 +760,22 @@ bool hubbub_tokeniser_handle_data(hubbub_tokeniser *tokeniser)
 			tokeniser->context.chars.len = len;
 			tokeniser->state = STATE_TAG_OPEN;
 			break;
-		} else if (c == '>') {
+		} else if (c == '>' && tokeniser->escape_flag == true &&
+				(tokeniser->content_model ==
+						HUBBUB_CONTENT_MODEL_RCDATA ||
+				tokeniser->content_model ==
+						HUBBUB_CONTENT_MODEL_CDATA)) {
 			/* no need to check that there are enough characters,
 			 * since you can only run into this if the flag is
 			 * true in the first place, which requires four
 			 * characters. */
-			if (tokeniser->escape_flag == true &&
-					(tokeniser->content_model ==
-						HUBBUB_CONTENT_MODEL_RCDATA ||
-					tokeniser->content_model ==
-						HUBBUB_CONTENT_MODEL_CDATA)) {
-
-				cptr = parserutils_inputstream_peek(
-						tokeniser->input,
-						tokeniser->context.chars.len - 2,
-						&len);
+			cptr = parserutils_inputstream_peek(
+					tokeniser->input,
+					tokeniser->context.chars.len - 2,
+					&len);
 
-				if (strncmp((char *)cptr,
-						"-->", SLEN("-->")) == 0) {
-					tokeniser->escape_flag = false;
-				}
+			if (strncmp((char *)cptr, "-->", SLEN("-->")) == 0) {
+				tokeniser->escape_flag = false;
 			}
 
 			tokeniser->context.chars.len += len;
-- 
cgit v1.2.3