Merge pull request #868 from neheb/4
[feed/telephony.git] / libs / dahdi-linux / patches / 205-dahdi-xpp-fix-wrong-printf-to-d.patch
1 From 14a9e676d635b1c2be1bab4114cc76c1793892d0 Mon Sep 17 00:00:00 2001
2 From: Christian Marangi <ansuelsmth@gmail.com>
3 Date: Fri, 12 May 2023 20:22:31 +0200
4 Subject: [PATCH 6/6] dahdi: xpp: fix wrong printf to %d
5
6 Fix wrong printf that should be %d with int variables.
7
8 Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
9 ---
10 drivers/dahdi/xpp/xbus-core.c | 2 +-
11 drivers/dahdi/xpp/xframe_queue.c | 4 ++--
12 2 files changed, 3 insertions(+), 3 deletions(-)
13
14 --- a/drivers/dahdi/xpp/xbus-core.c
15 +++ b/drivers/dahdi/xpp/xbus-core.c
16 @@ -1775,7 +1775,7 @@ static void xbus_fill_proc_queue(struct
17 s32 rem;
18 s64 lag_sec = div_s64_rem(q->worst_lag_usec, 1000, &rem);
19 seq_printf(sfile,
20 - "%-15s: counts %3d, %3d, %3d worst %3d, overflows %3d worst_lag %02lld.%ld ms\n",
21 + "%-15s: counts %3d, %3d, %3d worst %3d, overflows %3d worst_lag %02lld.%d ms\n",
22 q->name, q->steady_state_count, q->count, q->max_count,
23 q->worst_count, q->overflows, lag_sec,
24 rem);
25 --- a/drivers/dahdi/xpp/xframe_queue.c
26 +++ b/drivers/dahdi/xpp/xframe_queue.c
27 @@ -44,7 +44,7 @@ static void __xframe_dump_queue(struct x
28 s32 rem;
29 s64 sec = div_s64_rem(ktime_us_delta(now, xframe->kt_queued), 1000, &rem);
30
31 - snprintf(prefix, ARRAY_SIZE(prefix), " %3d> %5lld.%03ld msec",
32 + snprintf(prefix, ARRAY_SIZE(prefix), " %3d> %5lld.%03d msec",
33 i++, sec, rem);
34 dump_packet(prefix, pack, 1);
35 }
36 @@ -64,7 +64,7 @@ static bool __xframe_enqueue(struct xfra
37 if ((overflow_cnt++ % 1000) < 5) {
38 s32 rem;
39 s64 lag_sec = div_s64_rem(q->worst_lag_usec, 1000, &rem);
40 - NOTICE("Overflow of %-15s: counts %3d, %3d, %3d worst %3d, overflows %3d worst_lag %02lld.%ld ms\n",
41 + NOTICE("Overflow of %-15s: counts %3d, %3d, %3d worst %3d, overflows %3d worst_lag %02lld.%d ms\n",
42 q->name, q->steady_state_count, q->count,
43 q->max_count, q->worst_count, q->overflows,
44 lag_sec,