summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2018-02-08 08:55:14 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-02-16 18:05:39 +0000
commite6ae22abf1b12d6609ea2fb45974cba817da9ff1 (patch)
treea3ef637d55e8f67ca9fed22e6dd242868e94a310
parent95a59ddf94e349477e148380383b0c105cc49808 (diff)
downloadpoky-e6ae22abf1b12d6609ea2fb45974cba817da9ff1.tar.gz
puzzles: Fix warnings seen with clang 6.0
(From OE-Core rev: dc5b66d664495a284e77531c06ab981842d45c2e) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-sato/puzzles/files/0001-signpost-Add-paranthesis-to-remove-doubt-about-prece.patch47
-rw-r--r--meta/recipes-sato/puzzles/puzzles_git.bb1
2 files changed, 48 insertions, 0 deletions
diff --git a/meta/recipes-sato/puzzles/files/0001-signpost-Add-paranthesis-to-remove-doubt-about-prece.patch b/meta/recipes-sato/puzzles/files/0001-signpost-Add-paranthesis-to-remove-doubt-about-prece.patch
new file mode 100644
index 0000000000..19abdd5f35
--- /dev/null
+++ b/meta/recipes-sato/puzzles/files/0001-signpost-Add-paranthesis-to-remove-doubt-about-prece.patch
@@ -0,0 +1,47 @@
1From 7b2949c48a178861f6568a18c8f45e841e36f89e Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 7 Feb 2018 23:57:12 -0800
4Subject: [PATCH] signpost: Add paranthesis to remove doubt about precendence
5
6Clang complains e.g.
7
8error: logical not is only applied to the left hand side of
9 this bitwise operator [-Werror,-Wlogical-not-parentheses]
10
11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12---
13Upstream-Status: Pending
14
15 signpost.c | 2 +-
16 tracks.c | 2 +-
17 2 files changed, 2 insertions(+), 2 deletions(-)
18
19diff --git a/signpost.c b/signpost.c
20index aa2e13a..2e2dff2 100644
21--- a/signpost.c
22+++ b/signpost.c
23@@ -284,7 +284,7 @@ static int check_nums(game_state *orig, game_state *copy, int only_immutable)
24 int i, ret = 1;
25 assert(copy->n == orig->n);
26 for (i = 0; i < copy->n; i++) {
27- if (only_immutable && !copy->flags[i] & FLAG_IMMUTABLE) continue;
28+ if (only_immutable && !(copy->flags[i] & FLAG_IMMUTABLE)) continue;
29 assert(copy->nums[i] >= 0);
30 assert(copy->nums[i] <= copy->n);
31 if (copy->nums[i] != orig->nums[i]) {
32diff --git a/tracks.c b/tracks.c
33index 5b27350..ca44ce1 100644
34--- a/tracks.c
35+++ b/tracks.c
36@@ -1072,7 +1072,7 @@ static int solve_check_single_sub(game_state *state, int si, int id, int n,
37 x = i%w;
38 y = i/w;
39 if (abs(ox-x) > 1 || abs(oy-y) > 1) {
40- if (!state->sflags[i] & S_TRACK)
41+ if (!(state->sflags[i] & S_TRACK))
42 did += solve_set_sflag(state, x, y, S_NOTRACK, what);
43 }
44 }
45--
462.16.1
47
diff --git a/meta/recipes-sato/puzzles/puzzles_git.bb b/meta/recipes-sato/puzzles/puzzles_git.bb
index 6574e1dba4..4fe6298cba 100644
--- a/meta/recipes-sato/puzzles/puzzles_git.bb
+++ b/meta/recipes-sato/puzzles/puzzles_git.bb
@@ -14,6 +14,7 @@ SRC_URI = "git://git.tartarus.org/simon/puzzles.git \
14 file://0001-Use-labs-instead-of-abs.patch \ 14 file://0001-Use-labs-instead-of-abs.patch \
15 file://0001-palisade-Fix-warnings-with-clang-on-arm.patch \ 15 file://0001-palisade-Fix-warnings-with-clang-on-arm.patch \
16 file://0001-Use-Wno-error-format-overflow-if-the-compiler-suppor.patch \ 16 file://0001-Use-Wno-error-format-overflow-if-the-compiler-suppor.patch \
17 file://0001-signpost-Add-paranthesis-to-remove-doubt-about-prece.patch \
17 " 18 "
18UPSTREAM_CHECK_COMMITS = "1" 19UPSTREAM_CHECK_COMMITS = "1"
19SRCREV = "8dfe5cec31e784e4ece2955ecc8cc35ee7e8fbb3" 20SRCREV = "8dfe5cec31e784e4ece2955ecc8cc35ee7e8fbb3"