Module Name: src
Committed By: christos
Date: Sun Aug 29 11:43:25 UTC 2021
Modified Files:
src/usr.sbin/inetd: Makefile inetd.c
Log Message:
fix printf formats (intmax -> j)
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/usr.sbin/inetd/Makefile
cvs rdiff -u -r1.127 -r1.128 src/usr.sbin/inetd/inetd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/inetd/Makefile
diff -u src/usr.sbin/inetd/Makefile:1.25 src/usr.sbin/inetd/Makefile:1.26
--- src/usr.sbin/inetd/Makefile:1.25 Sun Aug 29 05:54:18 2021
+++ src/usr.sbin/inetd/Makefile Sun Aug 29 07:43:25 2021
@@ -1,8 +1,10 @@
# from: @(#)Makefile 8.1 (Berkeley) 6/6/93
-# $NetBSD: Makefile,v 1.25 2021/08/29 09:54:18 christos Exp $
+# $NetBSD: Makefile,v 1.26 2021/08/29 11:43:25 christos Exp $
.include <bsd.own.mk>
+COPTS+=-m32
+
USE_FORT?= yes # network server
PROG= inetd
Index: src/usr.sbin/inetd/inetd.c
diff -u src/usr.sbin/inetd/inetd.c:1.127 src/usr.sbin/inetd/inetd.c:1.128
--- src/usr.sbin/inetd/inetd.c:1.127 Sun Aug 29 05:54:18 2021
+++ src/usr.sbin/inetd/inetd.c Sun Aug 29 07:43:25 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: inetd.c,v 1.127 2021/08/29 09:54:18 christos Exp $ */
+/* $NetBSD: inetd.c,v 1.128 2021/08/29 11:43:25 christos Exp $ */
/*-
* Copyright (c) 1998, 2003 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 19
#if 0
static char sccsid[] = "@(#)inetd.c 8.4 (Berkeley) 4/13/94";
#else
-__RCSID("$NetBSD: inetd.c,v 1.127 2021/08/29 09:54:18 christos Exp $");
+__RCSID("$NetBSD: inetd.c,v 1.128 2021/08/29 11:43:25 christos Exp $");
#endif
#endif /* not lint */
@@ -2713,9 +2713,9 @@ rl_process(struct servtab *sep, int ctrl
rl_reset(sep, now);
} else {
syslog(LOG_ERR,
- SERV_FMT ": max spawn rate (%zu in %zi seconds) "
+ SERV_FMT ": max spawn rate (%zu in %ji seconds) "
"already met, closing until end of timeout in "
- "%zu seconds",
+ "%ju seconds",
SERV_PARAMS(sep),
sep->se_service_max,
(intmax_t)CNT_INTVL,
@@ -2770,7 +2770,7 @@ rl_process(struct servtab *sep, int ctrl
*/
syslog(LOG_ERR, SERV_FMT
": max ip spawn rate (%zu in "
- "%zi seconds) for "
+ "%ji seconds) for "
"%." TOSTRING(NI_MAXHOST) "s "
"already met; service not started",
SERV_PARAMS(sep),
@@ -2941,7 +2941,7 @@ rl_add(struct servtab *sep, char* ip)
static void
rl_reset(struct servtab *sep, time_t now)
{
- DPRINTF(SERV_FMT ": %zi seconds passed; resetting rate limiting ",
+ DPRINTF(SERV_FMT ": %ji seconds passed; resetting rate limiting ",
SERV_PARAMS(sep), (intmax_t)(now - sep->se_time));
sep->se_count = 0;
