From: Reini Urban <rurban@cpanel.net>
Date: Tue, 13 Sep 2016 13:37:56 +0000 (+0200)
Subject: fix clang -Wlogical-op warnings
X-Git-Tag: upstream/0.2.2^2~11
X-Git-Url: http://andersk.mit.edu/gitweb/libyaml.git/commitdiff_plain/551ad48994360f994af0649686885aa3946e029f

fix clang -Wlogical-op warnings

Commit amended by @perlpunk after suggestion from @tlsa
---

diff --git a/src/scanner.c b/src/scanner.c
index cbe5c6f..ceee749 100644
--- a/src/scanner.c
+++ b/src/scanner.c
@@ -2860,7 +2860,7 @@ yaml_parser_scan_block_scalar(yaml_parser_t *parser, yaml_token_t *token,
 
     if (!CACHE(parser, 1)) goto error;
 
-    while ((int)parser->mark.column == indent && !IS_Z(parser->buffer))
+    while ((int)parser->mark.column == indent && !(IS_Z(parser->buffer)))
     {
         /*
          * We are at the beginning of a non-empty line.
diff --git a/src/yaml_private.h b/src/yaml_private.h
index eb72207..d2971b8 100644
--- a/src/yaml_private.h
+++ b/src/yaml_private.h
@@ -171,14 +171,14 @@ yaml_string_join(
  * Check the octet at the specified position.
  */
 
-#define CHECK_AT(string,octet,offset)                                           \
+#define CHECK_AT(string,octet,offset)                   \
     ((string).pointer[offset] == (yaml_char_t)(octet))
 
 /*
  * Check the current octet in the buffer.
  */
 
-#define CHECK(string,octet) CHECK_AT((string),(octet),0)
+#define CHECK(string,octet) (CHECK_AT((string),(octet),0))
 
 /*
  * Check if the character at the specified position is an alphabetical