puzzles: Fix build with clang

Clang uncovered an error where abs() is used on long types, we shoud be
using labs()

(From OE-Core rev: cb92ac5389ed3cecf13158a0150e211b5392aba7)

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>
This commit is contained in:
Khem Raj
2015-09-07 09:06:10 +00:00
committed by Richard Purdie
parent decbbac612
commit 60a57c7f14
2 changed files with 47 additions and 0 deletions

View File

@@ -0,0 +1,46 @@
From 9808dc09e08937c9bffd858d3ded428225a4312a Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Mon, 7 Sep 2015 09:02:38 +0000
Subject: [PATCH] Use labs instead of abs
cluevals is array of longs so we have to use labs() instead of abs()
since abs() returns int
Fixes
keen.c:1458:17: error: absolute value function 'abs' given an argument
of type 'long' but has parameter of type 'int' which may cause
truncation of value
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
Upstream-Status: Pending
keen.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/keen.c b/keen.c
index a6a7238..1631992 100644
--- a/keen.c
+++ b/keen.c
@@ -1043,7 +1043,7 @@ done
cluevals[j] *= grid[i];
break;
case C_SUB:
- cluevals[j] = abs(cluevals[j] - grid[i]);
+ cluevals[j] = labs(cluevals[j] - grid[i]);
break;
case C_DIV:
{
@@ -1455,7 +1455,7 @@ static int check_errors(const game_state *state, long *errors)
cluevals[j] *= state->grid[i];
break;
case C_SUB:
- cluevals[j] = abs(cluevals[j] - state->grid[i]);
+ cluevals[j] = labs(cluevals[j] - state->grid[i]);
break;
case C_DIV:
{
--
2.5.1

View File

@@ -11,6 +11,7 @@ LIC_FILES_CHKSUM = "file://LICENCE;md5=33bcd4bce8f3c197f2aefbdbd2d299bc"
SRC_URI = "git://git.tartarus.org/simon/puzzles.git \
file://fix-compiling-failure-with-option-g-O.patch \
file://0001-Use-labs-instead-of-abs.patch \
"
SRCREV = "c296301a06ce49b87c954c9d15452521dfeddf1a"
PE = "1"