mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-07-16 16:27:27 +00:00
libsocketcan: upgrade to 0.0.9
and include a compile fix Signed-off-by: Eric Bénard <eric@eukrea.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
committed by
Martin Jansa
parent
13f540c5a9
commit
8b9fccbbfa
+39
@@ -0,0 +1,39 @@
|
|||||||
|
From 94094cc4ee7ae585da3e5e7e83e7d82b5d6de656 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Alexander Stein <alexander.stein@systec-electronic.com>
|
||||||
|
Date: Wed, 14 Nov 2012 12:13:06 +0100
|
||||||
|
Subject: [PATCH] Use strcmp instead of sizeof on char* string
|
||||||
|
|
||||||
|
This bug was detected by the clang warning:
|
||||||
|
libsocketcan.c:384:16: warning: argument to 'sizeof' in 'strncmp' call
|
||||||
|
is the same expression as the source; did you mean to provide an
|
||||||
|
explicit length? [-Wsizeof-pointer-memaccess]
|
||||||
|
sizeof(name)) != 0)
|
||||||
|
~~~~~~~^~~~~~
|
||||||
|
|
||||||
|
Signed-off-by: Alexander Stein <alexander.stein@systec-electronic.com>
|
||||||
|
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
|
||||||
|
---
|
||||||
|
Upstream-Status: Backport
|
||||||
|
|
||||||
|
src/libsocketcan.c | 5 ++---
|
||||||
|
1 file changed, 2 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/src/libsocketcan.c b/src/libsocketcan.c
|
||||||
|
index fedcbdc..841c2ed 100644
|
||||||
|
--- a/src/libsocketcan.c
|
||||||
|
+++ b/src/libsocketcan.c
|
||||||
|
@@ -379,9 +379,8 @@ static int do_get_nl_link(int fd, __u8 acquire, const char *name, void *res)
|
||||||
|
nl_msg->nlmsg_len - NLMSG_LENGTH(sizeof(struct ifaddrmsg));
|
||||||
|
parse_rtattr(tb, IFLA_MAX, IFLA_RTA(ifi), len);
|
||||||
|
|
||||||
|
- if (strncmp
|
||||||
|
- ((char *)RTA_DATA(tb[IFLA_IFNAME]), name,
|
||||||
|
- sizeof(name)) != 0)
|
||||||
|
+ if (strcmp
|
||||||
|
+ ((char *)RTA_DATA(tb[IFLA_IFNAME]), name) != 0)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
if (tb[IFLA_LINKINFO])
|
||||||
|
--
|
||||||
|
1.8.3.1
|
||||||
|
|
||||||
+4
-3
@@ -5,9 +5,10 @@ SECTION = "libs/network"
|
|||||||
LICENSE = "LGPLv2.1"
|
LICENSE = "LGPLv2.1"
|
||||||
LIC_FILES_CHKSUM = "file://src/libsocketcan.c;beginline=3;endline=17;md5=97e38adced4385d8fba1ae2437cedee1"
|
LIC_FILES_CHKSUM = "file://src/libsocketcan.c;beginline=3;endline=17;md5=97e38adced4385d8fba1ae2437cedee1"
|
||||||
|
|
||||||
SRCREV = "3a2cec63a4e6212cc63d21008453bd799cfe8774"
|
SRCREV = "e1a224bf1c409adf0c02b07a90deada634e54b88"
|
||||||
|
|
||||||
SRC_URI = "git://git.pengutronix.de/git/tools/libsocketcan.git \
|
SRC_URI = "git://git.pengutronix.de/git/tools/libsocketcan.git;protocol=git \
|
||||||
|
file://0001-Use-strcmp-instead-of-sizeof-on-char-string.patch \
|
||||||
"
|
"
|
||||||
|
|
||||||
S = "${WORKDIR}/git"
|
S = "${WORKDIR}/git"
|
||||||
@@ -15,5 +16,5 @@ S = "${WORKDIR}/git"
|
|||||||
inherit autotools pkgconfig
|
inherit autotools pkgconfig
|
||||||
|
|
||||||
do_configure_prepend() {
|
do_configure_prepend() {
|
||||||
sed -i -e s:tests/GNUmakefile::g -e s:trunk:0.0.8: configure.ac
|
sed -i -e s:tests/GNUmakefile::g -e s:trunk:0.0.9: configure.ac
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user