proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-07-26 04:54:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #4482 from opensourcerouting/warnings-20190606

Browse Source 
*: fix some dumb printf format warnings
This commit is contained in:
Russ White 2019-06-11 08:33:48 -04:00 committed by GitHub
commit 6aba4eeaec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/thread.c
View File

@ -96,8 +96,10 @@ static void vty_out_cpu_thread_history(struct vty *vty,
struct cpu_thread_history *a) struct cpu_thread_history *a)
{ {
vty_out(vty, "%5zu %10zu.%03zu %9zu %8zu %9zu %8zu %9zu", vty_out(vty, "%5zu %10zu.%03zu %9zu %8zu %9zu %8zu %9zu",
a->total_active, a->cpu.total / 1000, a->cpu.total % 1000, (size_t)a->total_active,
a->total_calls, a->cpu.total / a->total_calls, a->cpu.max, a->cpu.total / 1000, a->cpu.total % 1000,
(size_t)a->total_calls,
a->cpu.total / a->total_calls, a->cpu.max,
a->real.total / a->total_calls, a->real.max); a->real.total / a->total_calls, a->real.max);
vty_out(vty, " %c%c%c%c%c %s\n", vty_out(vty, " %c%c%c%c%c %s\n",
a->types & (1 << THREAD_READ) ? 'R' : ' ', a->types & (1 << THREAD_READ) ? 'R' : ' ',

4
sharpd/sharp_vty.c
View File

@ -145,12 +145,12 @@ DEFPY (install_routes_data_dump,
struct timeval r; struct timeval r;
timersub(&sg.r.t_end, &sg.r.t_start, &r); timersub(&sg.r.t_end, &sg.r.t_start, &r);
vty_out(vty, "Prefix: %s Total: %u %u %u Time: %ld.%ld\n", vty_out(vty, "Prefix: %s Total: %u %u %u Time: %jd.%ld\n",
prefix2str(&sg.r.orig_prefix, buf, sizeof(buf)), prefix2str(&sg.r.orig_prefix, buf, sizeof(buf)),
sg.r.total_routes, sg.r.total_routes,
sg.r.installed_routes, sg.r.installed_routes,
sg.r.removed_routes, sg.r.removed_routes,
r.tv_sec, (long int)r.tv_usec); (intmax_t)r.tv_sec, (long)r.tv_usec);
return CMD_SUCCESS; return CMD_SUCCESS;
} }

8
sharpd/sharp_zebra.c
View File

@ -212,8 +212,8 @@ static int route_notify_owner(ZAPI_CALLBACK_ARGS)
if (sg.r.total_routes == sg.r.installed_routes) { if (sg.r.total_routes == sg.r.installed_routes) {
monotime(&sg.r.t_end); monotime(&sg.r.t_end);
timersub(&sg.r.t_end, &sg.r.t_start, &r); timersub(&sg.r.t_end, &sg.r.t_start, &r);
zlog_debug("Installed All Items %ld.%ld", r.tv_sec, zlog_debug("Installed All Items %jd.%ld",
(long int)r.tv_usec); (intmax_t)r.tv_sec, (long)r.tv_usec);
handle_repeated(true); handle_repeated(true);
} }
break; break;
@ -228,8 +228,8 @@ static int route_notify_owner(ZAPI_CALLBACK_ARGS)
if (sg.r.total_routes == sg.r.removed_routes) { if (sg.r.total_routes == sg.r.removed_routes) {
monotime(&sg.r.t_end); monotime(&sg.r.t_end);
timersub(&sg.r.t_end, &sg.r.t_start, &r); timersub(&sg.r.t_end, &sg.r.t_start, &r);
zlog_debug("Removed all Items %ld.%ld", r.tv_sec, zlog_debug("Removed all Items %jd.%ld",
(long int)r.tv_usec); (intmax_t)r.tv_sec, (long)r.tv_usec);
handle_repeated(false); handle_repeated(false);
} }
break; break;

9
watchfrr/watchfrr.c
View File

@ -1021,10 +1021,11 @@ void watchfrr_status(struct vty *vty)
else if (dmn->state == DAEMON_DOWN && else if (dmn->state == DAEMON_DOWN &&
time_elapsed(&delay, &dmn->restart.time)->tv_sec time_elapsed(&delay, &dmn->restart.time)->tv_sec
< dmn->restart.interval) < dmn->restart.interval)
vty_out(vty, " restarting in %ld seconds" vty_out(vty, " restarting in %jd seconds"
" (%lds backoff interval)\n", " (%jds backoff interval)\n",
dmn->restart.interval - delay.tv_sec, (intmax_t)dmn->restart.interval
dmn->restart.interval); - (intmax_t)delay.tv_sec,
(intmax_t)dmn->restart.interval);
} }
} }