mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-05-31 01:10:08 +00:00
Code Issues Projects Releases Wiki Activity

ssiapi: Fix build errors found with clang

Browse Source 
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Khem Raj
2017-07-26 11:58:14 -07:00
committed by Martin Jansa
parent fb10f1b4d7
commit 9ef4f05cf4
2 changed files with 41 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-support/ssiapi/ssiapi/0001-ssieventmonitor-ordered-comparison-between-pointers-.patch
+39
View File
@@ -0,0 +1,39 @@
From ea9ecf4bf305f9509d5822b3823658a40162f43c Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Tue, 25 Jul 2017 19:08:21 -0700
Subject: [PATCH] ssieventmonitor: ordered comparison between pointers and
zero, actually with NULL
Comparing which is large or small between a pointer and NULL
however, looks completely illogical. Ordered comparison of
two valid pointers is legit, but no pointer will be smaller
than NULL , so comparing if a pointer is larger than NULL
simply means if the pointer is not NULL.
Fixes errors found with clang e.g.
| ssieventmonitor.cpp:339:53: error: ordered comparison between pointer and zero ('char *' and 'int')
| if (fgets(nextline, sizeof(nextline) - 1, mdstat) < 0) {
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^ ~
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
tools/ssieventmonitor.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/ssieventmonitor.cpp b/tools/ssieventmonitor.cpp
index f04b8f0..7a00122 100644
--- a/tools/ssieventmonitor.cpp
+++ b/tools/ssieventmonitor.cpp
@@ -336,7 +336,7 @@ static int _read_mdstat(int fd)
if (!strncmp(line, "md", 2)) {
if (strstr(line, INACTIVE_STR)) { /* possibly container */
char nextline[1024];
- if (fgets(nextline, sizeof(nextline) - 1, mdstat) < 0) {
+ if (fgets(nextline, sizeof(nextline) - 1, mdstat) != (char *) NULL) {
fclose(mdstat);
return 1;
}
--
2.13.3
meta-oe/recipes-support/ssiapi/ssiapi_1.0.1.bb
+2 -1
View File
@@ -18,7 +18,8 @@ SRC_URI = "http://sourceforge.net/projects/irstessi/files/${BPN}.${PV}.tgz \
file://0005-engine-Define-SENTINEL.patch \
file://0006-tools-Add-missing-includes-and-use-realpath-instead-.patch \
file://configure-cflags.patch \
"
file://0001-ssieventmonitor-ordered-comparison-between-pointers-.patch \
"
SRC_URI[md5sum] = "02f16d7cbd30d28034093212906591f5"
SRC_URI[sha256sum] = "e10d283b0f211afb8ebd0bde87c097769613d30a052cdf164753e35e803264c7"