Blame SOURCES/0021-Fix-gcc-12-compiler-warnings-on-lkcd_-.c.patch

56ae9b
From a4f8fe965e1ed0d27aff0cdf30e2c571da2e5356 Mon Sep 17 00:00:00 2001
56ae9b
From: Kazuhito Hagio <k-hagio-ab@nec.com>
56ae9b
Date: Thu, 1 Sep 2022 14:03:09 +0900
56ae9b
Subject: [PATCH 21/28] Fix gcc-12 compiler warnings on lkcd_*.c
56ae9b
56ae9b
Without the patch, the following gcc-12 compiler warnings are emitted
56ae9b
for lkcd_*.c:
56ae9b
56ae9b
lkcd_v1.c: In function 'dump_lkcd_environment_v1':
56ae9b
lkcd_v1.c:252:20: warning: the comparison will always evaluate as 'true' for the address of 'dh_panic_string' will never be NULL [-Waddress]
56ae9b
  252 |                 dh && dh->dh_panic_string &&
56ae9b
      |                    ^~
56ae9b
In file included from lkcd_v1.c:21:
56ae9b
lkcd_vmdump_v1.h:108:30: note: 'dh_panic_string' declared here
56ae9b
  108 |         char                 dh_panic_string[DUMP_PANIC_LEN];
56ae9b
      |                              ^~~~~~~~~~~~~~~
56ae9b
...
56ae9b
56ae9b
Reported-by: Lianbo Jiang <lijiang@redhat.com>
56ae9b
Signed-off-by: Kazuhito Hagio <k-hagio-ab@nec.com>
56ae9b
Signed-off-by: Lianbo Jiang <lijiang@redhat.com>
56ae9b
---
56ae9b
 lkcd_v1.c    | 3 +--
56ae9b
 lkcd_v2_v3.c | 3 +--
56ae9b
 lkcd_v5.c    | 3 +--
56ae9b
 lkcd_v7.c    | 3 +--
56ae9b
 lkcd_v8.c    | 3 +--
56ae9b
 5 files changed, 5 insertions(+), 10 deletions(-)
56ae9b
56ae9b
diff --git a/lkcd_v1.c b/lkcd_v1.c
56ae9b
index 5f891aeb1ce3..31bdc04c5fdd 100644
56ae9b
--- a/lkcd_v1.c
56ae9b
+++ b/lkcd_v1.c
56ae9b
@@ -249,8 +249,7 @@ dump_header_only:
56ae9b
         lkcd_print("          dh_eip: %lx\n", dh->dh_eip);
56ae9b
 	lkcd_print("    dh_num_pages: %d\n", dh->dh_num_pages);
56ae9b
         lkcd_print(" dh_panic_string: %s%s", dh->dh_panic_string,
56ae9b
-		dh && dh->dh_panic_string &&
56ae9b
-		strstr(dh->dh_panic_string, "\n") ? "" : "\n");
56ae9b
+		dh && strstr(dh->dh_panic_string, "\n") ? "" : "\n");
56ae9b
         lkcd_print("         dh_time: %s\n",
56ae9b
                         strip_linefeeds(ctime(&(dh->dh_time.tv_sec))));
56ae9b
 
56ae9b
diff --git a/lkcd_v2_v3.c b/lkcd_v2_v3.c
56ae9b
index 8635a7b07c77..edcb6637a55e 100644
56ae9b
--- a/lkcd_v2_v3.c
56ae9b
+++ b/lkcd_v2_v3.c
56ae9b
@@ -307,8 +307,7 @@ dump_header_only:
56ae9b
 	lkcd_print("    dh_num_pages: ");
56ae9b
 	lkcd_print(BITS32() ? "%ld\n" : "%d\n", dh->dh_num_pages);
56ae9b
         lkcd_print(" dh_panic_string: %s%s", dh->dh_panic_string,
56ae9b
-		dh && dh->dh_panic_string &&
56ae9b
-		strstr(dh->dh_panic_string, "\n") ? "" : "\n");
56ae9b
+		dh && strstr(dh->dh_panic_string, "\n") ? "" : "\n");
56ae9b
         lkcd_print("         dh_time: %s\n",
56ae9b
                         strip_linefeeds(ctime(&(dh->dh_time.tv_sec))));
56ae9b
 
56ae9b
diff --git a/lkcd_v5.c b/lkcd_v5.c
56ae9b
index cb7634d094ec..e3bfa6f4b272 100644
56ae9b
--- a/lkcd_v5.c
56ae9b
+++ b/lkcd_v5.c
56ae9b
@@ -270,8 +270,7 @@ dump_header_only:
56ae9b
 	lkcd_print("    dh_num_pages: ");
56ae9b
 	lkcd_print(BITS32() ? "%ld\n" : "%d\n", dh->dh_num_pages);
56ae9b
         lkcd_print(" dh_panic_string: %s%s", dh->dh_panic_string,
56ae9b
-		dh && dh->dh_panic_string &&
56ae9b
-		strstr(dh->dh_panic_string, "\n") ? "" : "\n");
56ae9b
+		dh && strstr(dh->dh_panic_string, "\n") ? "" : "\n");
56ae9b
         lkcd_print("         dh_time: %s\n",
56ae9b
                         strip_linefeeds(ctime(&(dh->dh_time.tv_sec))));
56ae9b
 
56ae9b
diff --git a/lkcd_v7.c b/lkcd_v7.c
56ae9b
index 608e1481f01d..97d99008635a 100644
56ae9b
--- a/lkcd_v7.c
56ae9b
+++ b/lkcd_v7.c
56ae9b
@@ -347,8 +347,7 @@ dump_header_only:
56ae9b
 	lkcd_print("    dh_num_pages: ");
56ae9b
 	lkcd_print(BITS32() ? "%ld\n" : "%d\n", dh->dh_num_pages);
56ae9b
         lkcd_print(" dh_panic_string: %s%s", dh->dh_panic_string,
56ae9b
-		dh && dh->dh_panic_string &&
56ae9b
-		strstr(dh->dh_panic_string, "\n") ? "" : "\n");
56ae9b
+		dh && strstr(dh->dh_panic_string, "\n") ? "" : "\n");
56ae9b
         lkcd_print("         dh_time: %s\n",
56ae9b
                         strip_linefeeds(ctime(&(dh->dh_time.tv_sec))));
56ae9b
 
56ae9b
diff --git a/lkcd_v8.c b/lkcd_v8.c
56ae9b
index 3b355e056123..4167fa5e4292 100644
56ae9b
--- a/lkcd_v8.c
56ae9b
+++ b/lkcd_v8.c
56ae9b
@@ -543,8 +543,7 @@ dump_header_only:
56ae9b
 	lkcd_print("    dh_num_pages: ");
56ae9b
 	lkcd_print(BITS32() ? "%ld\n" : "%d\n", dh->dh_num_pages);
56ae9b
         lkcd_print(" dh_panic_string: %s%s", dh->dh_panic_string,
56ae9b
-		dh && dh->dh_panic_string &&
56ae9b
-		strstr(dh->dh_panic_string, "\n") ? "" : "\n");
56ae9b
+		dh && strstr(dh->dh_panic_string, "\n") ? "" : "\n");
56ae9b
 	tv.tv_sec = dh->dh_time.tv_sec;
56ae9b
         lkcd_print("         dh_time: %s\n",
56ae9b
                         strip_linefeeds(ctime(&(tv.tv_sec))));
56ae9b
-- 
56ae9b
2.37.1
56ae9b