chao
/
linuxptp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix new -Wformat warnings. 

Signed-off-by: Miroslav Lichvar <mlichvar@redhat.com>
master
Miroslav Lichvar 2014-02-11 14:38:35 +01:00 committed by Richard Cochran
parent 1fa57ac411
commit 9190959693
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
clock.c
View File

@ -997,20 +997,20 @@ void clock_path_delay(struct clock *c, struct timespec req, struct timestamp rx,
pd = tmv_div(pd, 2); pd = tmv_div(pd, 2);
if (pd < 0) { if (pd < 0) {
pr_debug("negative path delay %10lld", pd); pr_debug("negative path delay %10" PRId64, pd);
pr_debug("path_delay = (t2 - t3) + (t4 - t1) - (c1 + c2 + c3)"); pr_debug("path_delay = (t2 - t3) + (t4 - t1) - (c1 + c2 + c3)");
pr_debug("t2 - t3 = %+10lld", t2 - t3); pr_debug("t2 - t3 = %+10" PRId64, t2 - t3);
pr_debug("t4 - t1 = %+10lld", t4 - t1); pr_debug("t4 - t1 = %+10" PRId64, t4 - t1);
pr_debug("c1 %10lld", c1); pr_debug("c1 %10" PRId64, c1);
pr_debug("c2 %10lld", c2); pr_debug("c2 %10" PRId64, c2);
pr_debug("c3 %10lld", c3); pr_debug("c3 %10" PRId64, c3);
} }
c->path_delay = filter_sample(c->delay_filter, pd); c->path_delay = filter_sample(c->delay_filter, pd);
c->cur.meanPathDelay = tmv_to_TimeInterval(c->path_delay); c->cur.meanPathDelay = tmv_to_TimeInterval(c->path_delay);
pr_debug("path delay %10lld %10lld", c->path_delay, pd); pr_debug("path delay %10" PRId64 " %10" PRId64, c->path_delay, pd);
if (c->stats.delay) if (c->stats.delay)
stats_add_value(c->stats.delay, tmv_to_nanoseconds(pd)); stats_add_value(c->stats.delay, tmv_to_nanoseconds(pd));

2
clockadj.c
View File

@ -125,7 +125,7 @@ void sysclk_set_leap(int leap)
if (clock_adjtime(clkid, &tx) < 0) if (clock_adjtime(clkid, &tx) < 0)
pr_err("failed to set the clock status: %m"); pr_err("failed to set the clock status: %m");
else if (m) else if (m)
pr_notice(m); pr_notice("%s", m);
realtime_leap_bit = tx.status; realtime_leap_bit = tx.status;
} }

6
port.c
View File

@ -468,8 +468,8 @@ static int port_capable(struct port *p)
if (tmv_to_nanoseconds(p->peer_delay) > p->neighborPropDelayThresh) { if (tmv_to_nanoseconds(p->peer_delay) > p->neighborPropDelayThresh) {
if (p->asCapable) if (p->asCapable)
pr_debug("port %hu: peer_delay (%lld) > neighborPropDelayThresh " pr_debug("port %hu: peer_delay (%" PRId64 ") > neighborPropDelayThresh "
"(%lld), resetting asCapable", portnum(p), "(%" PRId32 "), resetting asCapable", portnum(p),
tmv_to_nanoseconds(p->peer_delay), tmv_to_nanoseconds(p->peer_delay),
p->neighborPropDelayThresh); p->neighborPropDelayThresh);
goto not_capable; goto not_capable;
@ -1791,7 +1791,7 @@ calc:
p->peerMeanPathDelay = tmv_to_TimeInterval(p->peer_delay); p->peerMeanPathDelay = tmv_to_TimeInterval(p->peer_delay);
pr_debug("pdelay %hu %10lld %10lld", portnum(p), p->peer_delay, pd); pr_debug("pdelay %hu %10" PRId64 "%10" PRId64, portnum(p), p->peer_delay, pd);
if (p->pod.follow_up_info) if (p->pod.follow_up_info)
port_nrate_calculate(p, t3, t4, tmv_add(c1, c2)); port_nrate_calculate(p, t3, t4, tmv_add(c1, c2));