d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pfctl: Don't use PRIu64

Browse Source 
Rather than PRIu64 we can just treat the data as uintmax_t, and use %jx
instead.

MFC after:	1 week
Suggested by:	kib
Sponsored by:	Rubicon Communications, LLC ("Netgate")
This commit is contained in:
Kristof Provost 2021-09-01 18:18:26 +02:00
parent dbb0cb19ec
commit 795d78a467
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sbin/pfctl/pfctl_parser.c
View File

@ -60,7 +60,6 @@ __FBSDID("$FreeBSD$");
#include <errno.h>
#include <err.h>
#include <ifaddrs.h>
#include <inttypes.h>
#include <unistd.h>
#include "pfctl_parser.h"
@ -576,9 +575,9 @@ print_status(struct pfctl_status *s, struct pfctl_syncookies *cookies, int opts)
(unsigned long long)s->pcounters[1][1][PF_DROP]);
}
printf("%-27s %14s %16s\n", "State Table", "Total", "Rate");
printf(" %-25s %14" PRIu64 " %14s\n", "current entries", s->states, "");
printf(" %-25s %14jx %14s\n", "current entries", s->states, "");
TAILQ_FOREACH(c, &s->fcounters, entry) {
printf(" %-25s %14" PRIu64 " ", c->name, c->counter);
printf(" %-25s %14jx ", c->name, c->counter);
if (runtime > 0)
printf("%14.1f/s\n",
(double)c->counter / (double)runtime);
@ -587,10 +586,10 @@ print_status(struct pfctl_status *s, struct pfctl_syncookies *cookies, int opts)
}
if (opts & PF_OPT_VERBOSE) {
printf("Source Tracking Table\n");
printf(" %-25s %14" PRIu64 " %14s\n", "current entries",
printf(" %-25s %14jx %14s\n", "current entries",
s->src_nodes, "");
TAILQ_FOREACH(c, &s->scounters, entry) {
printf(" %-25s %14" PRIu64 " ", c->name, c->counter);
printf(" %-25s %14jx ", c->name, c->counter);
if (runtime > 0)
printf("%14.1f/s\n",
(double)c->counter / (double)runtime);
@ -600,7 +599,7 @@ print_status(struct pfctl_status *s, struct pfctl_syncookies *cookies, int opts)
}
printf("Counters\n");
TAILQ_FOREACH(c, &s->counters, entry) {
printf(" %-25s %14" PRIu64 " ", c->name, c->counter);
printf(" %-25s %14jx ", c->name, c->counter);
if (runtime > 0)
printf("%14.1f/s\n",
(double)c->counter / (double)runtime);
@ -610,7 +609,7 @@ print_status(struct pfctl_status *s, struct pfctl_syncookies *cookies, int opts)
if (opts & PF_OPT_VERBOSE) {
printf("Limit Counters\n");
TAILQ_FOREACH(c, &s->lcounters, entry) {
printf(" %-25s %14" PRIu64 " ", c->name, c->counter);
printf(" %-25s %14jx ", c->name, c->counter);
if (runtime > 0)
printf("%14.1f/s\n",
(double)c->counter / (double)runtime);