mirror of
https://github.com/VIKINGYFY/immortalwrt.git
synced 2025-12-17 09:35:14 +00:00
f63d64ede0
Move all patch that got merged upstream from pending to backport and add related tag. This is to make it easier to update to kernel 6.12. Patch 680 required some special care as the upstream version had to be split in a series of 6 patch. Referesh all affected patch. Link: https://github.com/openwrt/openwrt/pull/18464 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,
|