forked from Openwrt-EcoNet/openwrt
456b7a5d48
This is an automatically generated commit which aids following Kernel patch history, as git will see the move and copy as a rename thus defeating the purpose. For the original discussion see: https://lists.openwrt.org/pipermail/openwrt-devel/2023-October/041673.html Signed-off-by: Mieczyslaw Nalewaj <namiltd@yahoo.com> Link: https://github.com/openwrt/openwrt/pull/16547 Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
54 lines
2.2 KiB
Diff
54 lines
2.2 KiB
Diff
From 9da39ef332c417ce52732564c1c682a6e1209302 Mon Sep 17 00:00:00 2001
|
|
From: Florian Eckert <fe@dev.tdt.de>
|
|
Date: Mon, 4 Dec 2023 15:13:35 +0100
|
|
Subject: [PATCH] tools/thermal/tmon: Fix compilation warning for wrong format
|
|
|
|
The following warnings are shown during compilation:
|
|
|
|
tui.c: In function 'show_cooling_device':
|
|
tui.c:216:40: warning: format '%d' expects argument of type 'int', but
|
|
argument 7 has type 'long unsigned int' [-Wformat=]
|
|
216 | "%02d %12.12s%6d %6d",
|
|
| ~~^
|
|
| |
|
|
| int
|
|
| %6ld
|
|
......
|
|
219 | ptdata.cdi[j].cur_state,
|
|
| ~~~~~~~~~~~~~~~~~~~~~~~
|
|
| |
|
|
| long unsigned int
|
|
tui.c:216:44: warning: format '%d' expects argument of type 'int', but
|
|
argument 8 has type 'long unsigned int' [-Wformat=]
|
|
216 | "%02d %12.12s%6d %6d",
|
|
| ~~^
|
|
| |
|
|
| int
|
|
| %6ld
|
|
......
|
|
220 | ptdata.cdi[j].max_state);
|
|
| ~~~~~~~~~~~~~~~~~~~~~~~
|
|
| |
|
|
| long unsigned int
|
|
|
|
To fix this, the correct string format must be used for printing.
|
|
|
|
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
|
|
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
|
|
Link: https://lore.kernel.org/r/20231204141335.2798194-1-fe@dev.tdt.de
|
|
---
|
|
tools/thermal/tmon/tui.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
--- a/tools/thermal/tmon/tui.c
|
|
+++ b/tools/thermal/tmon/tui.c
|
|
@@ -213,7 +213,7 @@ void show_cooling_device(void)
|
|
* cooling device instances. skip unused idr.
|
|
*/
|
|
mvwprintw(cooling_device_window, j + 2, 1,
|
|
- "%02d %12.12s%6d %6d",
|
|
+ "%02d %12.12s%6lu %6lu",
|
|
ptdata.cdi[j].instance,
|
|
ptdata.cdi[j].type,
|
|
ptdata.cdi[j].cur_state,
|