git: 795d78a46713 - main - pfctl: Don't use PRIu64

[Kristof Provost]

The branch main has been updated by kp:

URL: https://cgit.FreeBSD.org/src/commit/?id=795d78a46713fc16153966e77f20da2f40aac2a3

commit 795d78a46713fc16153966e77f20da2f40aac2a3
Author:     Kristof Provost <kp at FreeBSD.org>
AuthorDate: 2021-09-01 16:18:26 +0000
Commit:     Kristof Provost <kp at FreeBSD.org>
CommitDate: 2021-09-02 07:35:36 +0000

    pfctl: Don't use PRIu64
    
    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")
---
 sbin/pfctl/pfctl_parser.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/sbin/pfctl/pfctl_parser.c b/sbin/pfctl/pfctl_parser.c
index 9f955a8b1c96..04c3bf76bfd8 100644
--- a/sbin/pfctl/pfctl_parser.c
+++ b/sbin/pfctl/pfctl_parser.c
@@ -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);