From 0f9c69c193af29bea986efae917e4e24b4777724 Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde Date: Mon, 22 Jun 2020 12:20:51 +0200 Subject: [PATCH 1/5] can-calc-bit-timing: fix warning MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit although it looks like a false positive: /home/travis/build/linux-can/can-utils/can-calc-bit-timing.c: In function ‘print_bit_timing.isra.6’: /home/travis/build/linux-can/can-utils/can-calc-bit-timing.c:447:42: warning: ‘tseg2’ may be used uninitialized in this function [-Wmaybe-uninitialized] unsigned int brp, tsegall, tseg, tseg1, tseg2; ^ /home/travis/build/linux-can/can-utils/can-calc-bit-timing.c:447:35: warning: ‘tseg1’ may be used uninitialized in this function [-Wmaybe-uninitialized] unsigned int brp, tsegall, tseg, tseg1, tseg2; ^ Signed-off-by: Marc Kleine-Budde --- can-calc-bit-timing.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/can-calc-bit-timing.c b/can-calc-bit-timing.c index e3bee9f..9129844 100644 --- a/can-calc-bit-timing.c +++ b/can-calc-bit-timing.c @@ -444,7 +444,7 @@ static int can_calc_bittiming(struct net_device *dev, struct can_bittiming *bt, unsigned int spt_nominal; /* nominal sample point */ unsigned int best_tseg = 0; /* current best value for tseg */ unsigned int best_brp = 0; /* current best value for brp */ - unsigned int brp, tsegall, tseg, tseg1, tseg2; + unsigned int brp, tsegall, tseg, tseg1 = 0, tseg2 = 0; u64 v64; /* Use CiA recommended sample points */ From b29a75d4c630764cc8d36e87d9bfd2a19c4e6530 Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde Date: Mon, 22 Jun 2020 12:23:24 +0200 Subject: [PATCH 2/5] j1939cat: j1939cat_parse_args(): fix warning MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit although it looks like a false positive: /home/travis/build/linux-can/can-utils/j1939cat.c: In function ‘main’: /home/travis/build/linux-can/can-utils/j1939cat.c:648:6: warning: ‘ret’ may be used uninitialized in this function [-Wmaybe-uninitialized] int ret; ^ Signed-off-by: Marc Kleine-Budde --- j1939cat.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/j1939cat.c b/j1939cat.c index a37c5ba..5ae0c0b 100644 --- a/j1939cat.c +++ b/j1939cat.c @@ -645,7 +645,7 @@ static int j1939cat_parse_args(struct j1939cat_priv *priv, int argc, char *argv[ int main(int argc, char *argv[]) { struct j1939cat_priv *priv; - int ret; + int ret = 0; priv = malloc(sizeof(*priv)); if (!priv) @@ -679,6 +679,6 @@ int main(int argc, char *argv[]) close(priv->infile); close(priv->outfile); close(priv->sock); + return ret; } - From 57949154cce001cf9ab151af66c6023ac7a6fdd2 Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde Date: Mon, 22 Jun 2020 12:10:09 +0200 Subject: [PATCH 3/5] slcanpty: sort includes alphabetically Signed-off-by: Marc Kleine-Budde --- slcanpty.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/slcanpty.c b/slcanpty.c index fc72dfe..73ad501 100644 --- a/slcanpty.c +++ b/slcanpty.c @@ -24,17 +24,17 @@ * */ +#include +#include #include #include -#include #include -#include -#include #include +#include #include -#include #include +#include #include #include From a5c049d37a8396438b20004f87831637d7a8391a Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde Date: Mon, 22 Jun 2020 12:13:41 +0200 Subject: [PATCH 4/5] slcanpty: add missing include sys/select.h Signed-off-by: Marc Kleine-Budde --- slcanpty.c | 1 + 1 file changed, 1 insertion(+) diff --git a/slcanpty.c b/slcanpty.c index 73ad501..d233c0d 100644 --- a/slcanpty.c +++ b/slcanpty.c @@ -34,6 +34,7 @@ #include #include +#include #include #include #include From 8e3c050b1c8537fbf8c8d91b62cccd0faf98448b Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde Date: Mon, 22 Jun 2020 12:46:19 +0200 Subject: [PATCH 5/5] CMakeLists.txt: update test for _GNU_SOURCE to fix warnings ../asc2log.c:264:8: warning: implicit declaration of function 'strcasestr' is invalid in C99 [-Wimplicit-function-declaration] ptr = strcasestr(buf, tmp1); ^ ../asc2log.c:264:6: warning: incompatible integer to pointer conversion assigning to 'char *' from 'int' [-Wint-conversion] ptr = strcasestr(buf, tmp1); ^ ~~~~~~~~~~~~~~~~~~~~~ ../asc2log.c:328:6: warning: implicit declaration of function 'strcasestr' is invalid in C99 [-Wimplicit-function-declaration] if (strcasestr(date, " pm ") != NULL) { ^ ../asc2log.c:328:31: warning: comparison between pointer and integer ('int' and 'void *') [-Wpointer-integer-compare] if (strcasestr(date, " pm ") != NULL) { ~~~~~~~~~~~~~~~~~~~~~~~~ ^ ~~~~ ../asc2log.c:336:8: warning: implicit declaration of function 'strptime' is invalid in C99 [-Wimplicit-function-declaration] if (!strptime(date, "%B %d %I:%M:%S %p %Y", &tms)) { ^ ../asc2log.c:354:8: warning: implicit declaration of function 'strptime' is invalid in C99 [-Wimplicit-function-declaration] if (!strptime(date, "%B %d %H:%M:%S %Y", &tms)) { ../slcanpty.c:476:7: warning: implicit declaration of function 'grantpt' is invalid in C99 [-Wimplicit-function-declaration] if (grantpt(p) < 0) { ^ ../slcanpty.c:481:7: warning: implicit declaration of function 'unlockpt' is invalid in C99 [-Wimplicit-function-declaration] if (unlockpt(p) < 0) { ^ ../slcanpty.c:486:14: warning: implicit declaration of function 'ptsname' is invalid in C99 [-Wimplicit-function-declaration] name_pts = ptsname(p); ^ ../slcanpty.c:486:12: warning: incompatible integer to pointer conversion assigning to 'char *' from 'int' [-Wint-conversion] name_pts = ptsname(p); ^ ~~~~~~~~~~ Signed-off-by: Marc Kleine-Budde --- CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d40c6ae..6c619df 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,13 +2,15 @@ cmake_minimum_required(VERSION 3.3) project(can-utils LANGUAGES C) +include (CheckSymbolExists) include (GNUInstallDirs) if(NOT CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE Release) endif() -if ("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU") +check_symbol_exists(__GNU_LIBRARY__ "features.h" _GNU_SOURCE) +if(_GNU_SOURCE) add_definitions(-D_GNU_SOURCE) endif()