summaryrefslogtreecommitdiff
path: root/src/tokeniser
diff options
context:
space:
mode:
authorAndrew Sidwell <andy@entai.co.uk>2008-06-19 01:19:06 +0000
committerAndrew Sidwell <andy@entai.co.uk>2008-06-19 01:19:06 +0000
commitd94c20d3ea4935ac7bc98b364c2a8dc6eed79607 (patch)
tree78c972bfb9fef1d9489839dd86ba7db10fdfc5ff /src/tokeniser
parent647123a2fdc5b8c1926289465370453ed72cde21 (diff)
downloadlibhubbub-d94c20d3ea4935ac7bc98b364c2a8dc6eed79607.tar.gz
libhubbub-d94c20d3ea4935ac7bc98b364c2a8dc6eed79607.tar.bz2
Fix assert()s, and only compile the preceding line when debugging to avoid warnings.
svn path=/trunk/hubbub/; revision=4408
Diffstat (limited to 'src/tokeniser')
-rw-r--r--src/tokeniser/tokeniser.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/tokeniser/tokeniser.c b/src/tokeniser/tokeniser.c
index 1b3c733..1c73e9d 100644
--- a/src/tokeniser/tokeniser.c
+++ b/src/tokeniser/tokeniser.c
@@ -713,10 +713,12 @@ bool hubbub_tokeniser_handle_character_reference_data(hubbub_tokeniser *tokenise
return hubbub_tokeniser_consume_character_reference(tokeniser);
} else {
hubbub_token token;
+#ifndef NDEBUG
uint32_t c = hubbub_inputstream_peek(tokeniser->input);
- assert(c != HUBBUB_INPUTSTREAM_OOD ||
- c == HUBBUB_INPUTSTREAM_EOF);
+ assert(c != HUBBUB_INPUTSTREAM_OOD &&
+ c != HUBBUB_INPUTSTREAM_EOF);
+#endif
/* Emit character */
token.type = HUBBUB_TOKEN_CHARACTER;
@@ -1565,10 +1567,12 @@ bool hubbub_tokeniser_handle_character_reference_in_attribute_value(
if (tokeniser->context.match_entity.complete == false) {
return hubbub_tokeniser_consume_character_reference(tokeniser);
} else {
+#ifndef NDEBUG
uint32_t c = hubbub_inputstream_peek(tokeniser->input);
- assert(c != HUBBUB_INPUTSTREAM_OOD ||
- c == HUBBUB_INPUTSTREAM_EOF);
+ assert(c != HUBBUB_INPUTSTREAM_OOD &&
+ c != HUBBUB_INPUTSTREAM_EOF);
+#endif
pos = hubbub_inputstream_cur_pos(tokeniser->input, &len);