CVS commit: src/sys
Module Name:src Committed By: thorpej Date: Sat Sep 3 20:29:31 UTC 2022 Modified Files: src/sys/net: if_mpls.c src/sys/rump/net/lib/libnetmpls: Makefile Makefile.inc Log Message: Machete-waving to fix mpls rump build after pktqueue changes. To generate a diff of this commit: cvs rdiff -u -r1.40 -r1.41 src/sys/net/if_mpls.c cvs rdiff -u -r1.5 -r1.6 src/sys/rump/net/lib/libnetmpls/Makefile cvs rdiff -u -r1.2 -r1.3 src/sys/rump/net/lib/libnetmpls/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys
Module Name:src
Committed By: thorpej
Date: Sat Sep 3 20:29:31 UTC 2022
Modified Files:
src/sys/net: if_mpls.c
src/sys/rump/net/lib/libnetmpls: Makefile Makefile.inc
Log Message:
Machete-waving to fix mpls rump build after pktqueue changes.
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/sys/net/if_mpls.c
cvs rdiff -u -r1.5 -r1.6 src/sys/rump/net/lib/libnetmpls/Makefile
cvs rdiff -u -r1.2 -r1.3 src/sys/rump/net/lib/libnetmpls/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/if_mpls.c
diff -u src/sys/net/if_mpls.c:1.40 src/sys/net/if_mpls.c:1.41
--- src/sys/net/if_mpls.c:1.40 Sat Sep 3 02:47:59 2022
+++ src/sys/net/if_mpls.c Sat Sep 3 20:29:31 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: if_mpls.c,v 1.40 2022/09/03 02:47:59 thorpej Exp $ */
+/* $NetBSD: if_mpls.c,v 1.41 2022/09/03 20:29:31 thorpej Exp $ */
/*
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_mpls.c,v 1.40 2022/09/03 02:47:59 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_mpls.c,v 1.41 2022/09/03 20:29:31 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -104,6 +104,9 @@ extern int mpls_defttl, mpls_mapttl_inet
mpls_rfc4182;
static u_int mpls_count;
+
+void mplsattach(int);
+
/* ARGSUSED */
void
mplsattach(int count)
Index: src/sys/rump/net/lib/libnetmpls/Makefile
diff -u src/sys/rump/net/lib/libnetmpls/Makefile:1.5 src/sys/rump/net/lib/libnetmpls/Makefile:1.6
--- src/sys/rump/net/lib/libnetmpls/Makefile:1.5 Mon Oct 19 16:16:38 2015
+++ src/sys/rump/net/lib/libnetmpls/Makefile Sat Sep 3 20:29:30 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2015/10/19 16:16:38 pooka Exp $
+# $NetBSD: Makefile,v 1.6 2022/09/03 20:29:30 thorpej Exp $
#
.PATH: ${.CURDIR}/../../../../net ${.CURDIR}/../../../../netmpls
@@ -7,8 +7,7 @@ LIB= rumpnet_netmpls
COMMENT=Multiprotocol Label Switching (PF_MPLS)
IOCONF= NETMPLS.ioconf
-SRCS= mpls_ttl.c if_mpls.c
-SRCS+= netmpls_component.c
+SRCS= netmpls_component.c
.include
.include
Index: src/sys/rump/net/lib/libnetmpls/Makefile.inc
diff -u src/sys/rump/net/lib/libnetmpls/Makefile.inc:1.2 src/sys/rump/net/lib/libnetmpls/Makefile.inc:1.3
--- src/sys/rump/net/lib/libnetmpls/Makefile.inc:1.2 Tue Mar 18 18:20:44 2014
+++ src/sys/rump/net/lib/libnetmpls/Makefile.inc Sat Sep 3 20:29:30 2022
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.inc,v 1.2 2014/03/18 18:20:44 riastradh Exp $
+# $NetBSD: Makefile.inc,v 1.3 2022/09/03 20:29:30 thorpej Exp $
#
.PATH: ${.CURDIR}/../../../../netmpls
-SRCS+= mpls_proto.c
+SRCS+= mpls_ttl.c if_mpls.c mpls_proto.c
CVS commit: src/usr.bin/make/unit-tests
Module Name:src Committed By: sjg Date: Sat Sep 3 15:03:32 UTC 2022 Modified Files: src/usr.bin/make/unit-tests: Makefile Log Message: Only update distrib/sets/lists/tests/mi with valid files sync-mi: use CVS/Entries to ensure we only update distrib/sets/lists/tests/mi with files known to CVS. Reviewed by: rillig To generate a diff of this commit: cvs rdiff -u -r1.323 -r1.324 src/usr.bin/make/unit-tests/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/make/unit-tests/Makefile diff -u src/usr.bin/make/unit-tests/Makefile:1.323 src/usr.bin/make/unit-tests/Makefile:1.324 --- src/usr.bin/make/unit-tests/Makefile:1.323 Fri Sep 2 18:54:25 2022 +++ src/usr.bin/make/unit-tests/Makefile Sat Sep 3 15:03:32 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.323 2022/09/02 18:54:25 sjg Exp $ +# $NetBSD: Makefile,v 1.324 2022/09/03 15:03:32 sjg Exp $ # # Unit tests for make(1) # @@ -761,7 +761,8 @@ sync-mi: testsdir="usr.bin/make/unit-tests";\ fmt="./usr/tests/$$testsdir/%s\ttests-usr.bin-tests\tcompattestfile,atf\\n"; \ cat "$$mi" > "$$mi.tmp"; \ - (cd "$$testsdir" && ls *.exp *.mk) | xargs printf "$$fmt" >> "$$mi.tmp"; \ + (cd "$$testsdir" && egrep '\.(exp|mk)/' CVS/Entries | cut -d/ -f2) | \ + xargs printf "$$fmt" >> "$$mi.tmp"; \ distrib/sets/fmt-list "$$mi.tmp";\ mv "$$mi.tmp" "$$mi"; \ cvs diff "$$mi" || true
CVS commit: src/usr.bin/make/unit-tests
Module Name:src Committed By: sjg Date: Sat Sep 3 15:03:32 UTC 2022 Modified Files: src/usr.bin/make/unit-tests: Makefile Log Message: Only update distrib/sets/lists/tests/mi with valid files sync-mi: use CVS/Entries to ensure we only update distrib/sets/lists/tests/mi with files known to CVS. Reviewed by: rillig To generate a diff of this commit: cvs rdiff -u -r1.323 -r1.324 src/usr.bin/make/unit-tests/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/net
Module Name:src
Committed By: riastradh
Date: Sat Sep 3 10:03:20 UTC 2022
Modified Files:
src/sys/net: bpf.c
Log Message:
bpf(4): Reject bogus timeout values before arithmetic overflows.
Reported-by: syzbot+fbd86bdf579944b64...@syzkaller.appspotmail.com
https://syzkaller.appspot.com/bug?id=60d46fd4863952897cbf67c6b1bcc8b20ec7bde6
XXX pullup-8
XXX pullup-9
To generate a diff of this commit:
cvs rdiff -u -r1.246 -r1.247 src/sys/net/bpf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/bpf.c
diff -u src/sys/net/bpf.c:1.246 src/sys/net/bpf.c:1.247
--- src/sys/net/bpf.c:1.246 Tue Mar 15 13:00:44 2022
+++ src/sys/net/bpf.c Sat Sep 3 10:03:20 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: bpf.c,v 1.246 2022/03/15 13:00:44 riastradh Exp $ */
+/* $NetBSD: bpf.c,v 1.247 2022/09/03 10:03:20 riastradh Exp $ */
/*
* Copyright (c) 1990, 1991, 1993
@@ -39,7 +39,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: bpf.c,v 1.246 2022/03/15 13:00:44 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bpf.c,v 1.247 2022/09/03 10:03:20 riastradh Exp $");
#if defined(_KERNEL_OPT)
#include "opt_bpf.h"
@@ -1152,7 +1152,11 @@ bpf_ioctl(struct file *fp, u_long cmd, v
struct timeval *tv = addr;
/* Compute number of ticks. */
- if (tv->tv_sec > INT_MAX/hz - 1) {
+ if (tv->tv_sec < 0 ||
+ tv->tv_usec < 0 || tv->tv_usec >= 100) {
+error = EINVAL;
+break;
+ } else if (tv->tv_sec > INT_MAX/hz - 1) {
d->bd_rtout = INT_MAX;
} else {
d->bd_rtout = tv->tv_sec * hz
@@ -1186,7 +1190,11 @@ bpf_ioctl(struct file *fp, u_long cmd, v
struct timeval50 *tv = addr;
/* Compute number of ticks. */
- if (tv->tv_sec > INT_MAX/hz - 1) {
+ if (tv->tv_sec < 0 ||
+ tv->tv_usec < 0 || tv->tv_usec >= 100) {
+error = EINVAL;
+break;
+ } else if (tv->tv_sec > INT_MAX/hz - 1) {
d->bd_rtout = INT_MAX;
} else {
d->bd_rtout = tv->tv_sec * hz
CVS commit: src/sys/net
Module Name:src Committed By: riastradh Date: Sat Sep 3 10:03:20 UTC 2022 Modified Files: src/sys/net: bpf.c Log Message: bpf(4): Reject bogus timeout values before arithmetic overflows. Reported-by: syzbot+fbd86bdf579944b64...@syzkaller.appspotmail.com https://syzkaller.appspot.com/bug?id=60d46fd4863952897cbf67c6b1bcc8b20ec7bde6 XXX pullup-8 XXX pullup-9 To generate a diff of this commit: cvs rdiff -u -r1.246 -r1.247 src/sys/net/bpf.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump/librump/rumpnet
Module Name:src
Committed By: mlelstv
Date: Sat Sep 3 09:41:24 UTC 2022
Modified Files:
src/sys/rump/librump/rumpnet: Makefile.rumpnet
Log Message:
netisr.c is gone.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/rump/librump/rumpnet/Makefile.rumpnet
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/librump/rumpnet/Makefile.rumpnet
diff -u src/sys/rump/librump/rumpnet/Makefile.rumpnet:1.24 src/sys/rump/librump/rumpnet/Makefile.rumpnet:1.25
--- src/sys/rump/librump/rumpnet/Makefile.rumpnet:1.24 Mon Oct 11 05:13:11 2021
+++ src/sys/rump/librump/rumpnet/Makefile.rumpnet Sat Sep 3 09:41:24 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rumpnet,v 1.24 2021/10/11 05:13:11 knakahara Exp $
+# $NetBSD: Makefile.rumpnet,v 1.25 2022/09/03 09:41:24 mlelstv Exp $
#
LIB= rumpnet
@@ -13,7 +13,7 @@ COMMENT= Rump kernel networking faction
${RUMPTOP}/../netipsec \
${RUMPTOP}/../compat/common
-SRCS= net_stub.c netisr.c rump_net.c
+SRCS= net_stub.c rump_net.c
SRCS+= rumpnet_if_wrappers.c
CVS commit: src/sys/rump/librump/rumpnet
Module Name:src Committed By: mlelstv Date: Sat Sep 3 09:41:24 UTC 2022 Modified Files: src/sys/rump/librump/rumpnet: Makefile.rumpnet Log Message: netisr.c is gone. To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/sys/rump/librump/rumpnet/Makefile.rumpnet Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/make
Module Name:src
Committed By: rillig
Date: Sat Sep 3 08:41:07 UTC 2022
Modified Files:
src/usr.bin/make: job.c
Log Message:
make: untangle output handling in jobs mode, remove redundant braces
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.454 -r1.455 src/usr.bin/make/job.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.bin/make/job.c
diff -u src/usr.bin/make/job.c:1.454 src/usr.bin/make/job.c:1.455
--- src/usr.bin/make/job.c:1.454 Sat Sep 3 08:03:27 2022
+++ src/usr.bin/make/job.c Sat Sep 3 08:41:07 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: job.c,v 1.454 2022/09/03 08:03:27 rillig Exp $ */
+/* $NetBSD: job.c,v 1.455 2022/09/03 08:41:07 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -142,7 +142,7 @@
#include "trace.h"
/* "@(#)job.c 8.2 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: job.c,v 1.454 2022/09/03 08:03:27 rillig Exp $");
+MAKE_RCSID("$NetBSD: job.c,v 1.455 2022/09/03 08:41:07 rillig Exp $");
/*
* A shell defines how the commands are run. All commands for a target are
@@ -1836,37 +1836,31 @@ again:
if (nRead < 0) {
if (errno == EAGAIN)
return;
- if (DEBUG(JOB)) {
+ if (DEBUG(JOB))
perror("CollectOutput(piperead)");
- }
nr = 0;
- } else {
+ } else
nr = (size_t)nRead;
- }
+
+ if (nr == 0)
+ finish = false; /* stop looping */
/*
* If we hit the end-of-file (the job is dead), we must flush its
* remaining output, so pretend we read a newline if there's any
* output remaining in the buffer.
- * Also clear the 'finish' flag so we stop looping.
*/
if (nr == 0 && job->curPos != 0) {
job->outBuf[job->curPos] = '\n';
nr = 1;
- finish = false;
- } else if (nr == 0) {
- finish = false;
}
- /*
- * Look for the last newline in the bytes we just got. If there is
- * one, break out of the loop with 'i' as its index and gotNL set
- * true.
- */
max = job->curPos + nr;
for (i = job->curPos; i < max; i++)
if (job->outBuf[i] == '\0')
job->outBuf[i] = ' ';
+
+ /* Look for the last newline in the bytes we just got. */
for (i = job->curPos + nr - 1;
i >= job->curPos && i != (size_t)-1; i--) {
if (job->outBuf[i] == '\n') {
CVS commit: src/usr.bin/make
Module Name:src Committed By: rillig Date: Sat Sep 3 08:41:07 UTC 2022 Modified Files: src/usr.bin/make: job.c Log Message: make: untangle output handling in jobs mode, remove redundant braces No functional change. To generate a diff of this commit: cvs rdiff -u -r1.454 -r1.455 src/usr.bin/make/job.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/make
Module Name:src
Committed By: rillig
Date: Sat Sep 3 08:03:27 UTC 2022
Modified Files:
src/usr.bin/make: job.c
src/usr.bin/make/unit-tests: job-output-null.exp job-output-null.mk
Log Message:
make: fix handling of null bytes in the output in jobs mode
The test job-output-null failed occasionally, depending on the exact
timing of the child's write and make's read.
To generate a diff of this commit:
cvs rdiff -u -r1.453 -r1.454 src/usr.bin/make/job.c
cvs rdiff -u -r1.3 -r1.4 src/usr.bin/make/unit-tests/job-output-null.exp \
src/usr.bin/make/unit-tests/job-output-null.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/job.c
diff -u src/usr.bin/make/job.c:1.453 src/usr.bin/make/job.c:1.454
--- src/usr.bin/make/job.c:1.453 Sat May 7 08:01:20 2022
+++ src/usr.bin/make/job.c Sat Sep 3 08:03:27 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: job.c,v 1.453 2022/05/07 08:01:20 rillig Exp $ */
+/* $NetBSD: job.c,v 1.454 2022/09/03 08:03:27 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -142,7 +142,7 @@
#include "trace.h"
/* "@(#)job.c 8.2 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: job.c,v 1.453 2022/05/07 08:01:20 rillig Exp $");
+MAKE_RCSID("$NetBSD: job.c,v 1.454 2022/09/03 08:03:27 rillig Exp $");
/*
* A shell defines how the commands are run. All commands for a target are
@@ -1864,18 +1864,14 @@ again:
* true.
*/
max = job->curPos + nr;
+ for (i = job->curPos; i < max; i++)
+ if (job->outBuf[i] == '\0')
+ job->outBuf[i] = ' ';
for (i = job->curPos + nr - 1;
i >= job->curPos && i != (size_t)-1; i--) {
if (job->outBuf[i] == '\n') {
gotNL = true;
break;
- } else if (job->outBuf[i] == '\0') {
- /*
- * FIXME: The null characters are only replaced with
- * space _after_ the last '\n'. Everywhere else they
- * hide the rest of the command output.
- */
- job->outBuf[i] = ' ';
}
}
Index: src/usr.bin/make/unit-tests/job-output-null.exp
diff -u src/usr.bin/make/unit-tests/job-output-null.exp:1.3 src/usr.bin/make/unit-tests/job-output-null.exp:1.4
--- src/usr.bin/make/unit-tests/job-output-null.exp:1.3 Sun Sep 12 10:26:49 2021
+++ src/usr.bin/make/unit-tests/job-output-null.exp Sat Sep 3 08:03:27 2022
@@ -1,4 +1,6 @@
-1
-2a
+1 trailing
+2a trailing
+2b trailing
+2c trailing
3a without newline, 3b without newline.
exit status 0
Index: src/usr.bin/make/unit-tests/job-output-null.mk
diff -u src/usr.bin/make/unit-tests/job-output-null.mk:1.3 src/usr.bin/make/unit-tests/job-output-null.mk:1.4
--- src/usr.bin/make/unit-tests/job-output-null.mk:1.3 Sun Sep 12 10:26:49 2021
+++ src/usr.bin/make/unit-tests/job-output-null.mk Sat Sep 3 08:03:27 2022
@@ -1,11 +1,11 @@
-# $NetBSD: job-output-null.mk,v 1.3 2021/09/12 10:26:49 rillig Exp $
+# $NetBSD: job-output-null.mk,v 1.4 2022/09/03 08:03:27 rillig Exp $
#
# Test how null bytes in the output of a command are handled. Make processes
# them using null-terminated strings, which may cut off some of the output.
#
-# As of 2021-04-15, make handles null bytes from the child process
-# inconsistently. It's an edge case though since typically the child
-# processes output text.
+# Before job.c 1.454 from 2022-09-03, make handled null bytes in the output
+# from the child process inconsistently. It's an edge case though since
+# typically the child processes output text.
# Note: The printf commands used in this test must only use a single format
# string, without parameters. This is because it is implementation-dependent
@@ -16,30 +16,40 @@
# NetBSD /bin/ksh 3 x write("fmt") (via /bin/printf)
# Bash 5 3 x write("fmt")
#
-# In the latter case the output may arrive in parts, which in this test makes
-# a crucial difference since the outcome of the test depends on whether there
-# is a '\n' in each of the blocks from the output.
+# In the latter case the output may arrive in 1 to 3 parts, depending on the
+# exact timing, which in this test makes a crucial difference since before
+# job.c 1.454 from 2022-09-03, the outcome of the test depended on whether
+# there was a '\n' in each of the blocks from the output. Depending on the
+# exact timing, the output of that test varied, its possible values were '2a',
+# '2a 2b', '2a 2c', '2a 2b 2c'.
.MAKEFLAGS: -j1 # force jobs mode
all: .PHONY
- # The null byte from the command output is kept as-is.
- # See CollectOutput, which looks like it intended to replace these
- # null bytes with simple spaces.
+ # The null byte from the command output is replaced with a single
+ # space by CollectOutput.
@printf '1\0trailing\n'
+ # expect: 1 trailing
# Give the parent process a chance to see the above output, but not
# yet the output from the next printf command.
@sleep 1
- # All null bytes from the command output are kept as-is.
+ # Each null byte from the comm
CVS commit: src/usr.bin/make
Module Name:src Committed By: rillig Date: Sat Sep 3 08:03:27 UTC 2022 Modified Files: src/usr.bin/make: job.c src/usr.bin/make/unit-tests: job-output-null.exp job-output-null.mk Log Message: make: fix handling of null bytes in the output in jobs mode The test job-output-null failed occasionally, depending on the exact timing of the child's write and make's read. To generate a diff of this commit: cvs rdiff -u -r1.453 -r1.454 src/usr.bin/make/job.c cvs rdiff -u -r1.3 -r1.4 src/usr.bin/make/unit-tests/job-output-null.exp \ src/usr.bin/make/unit-tests/job-output-null.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/rbootd
Module Name:src
Committed By: tsutsui
Date: Sat Sep 3 07:45:08 UTC 2022
Modified Files:
src/usr.sbin/rbootd: Makefile bpf.c parseconf.c utils.c
Log Message:
Make build with WARNS=5.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/usr.sbin/rbootd/Makefile
cvs rdiff -u -r1.21 -r1.22 src/usr.sbin/rbootd/bpf.c
cvs rdiff -u -r1.12 -r1.13 src/usr.sbin/rbootd/parseconf.c
cvs rdiff -u -r1.18 -r1.19 src/usr.sbin/rbootd/utils.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/rbootd/Makefile
diff -u src/usr.sbin/rbootd/Makefile:1.15 src/usr.sbin/rbootd/Makefile:1.16
--- src/usr.sbin/rbootd/Makefile:1.15 Sun Oct 13 07:28:20 2019
+++ src/usr.sbin/rbootd/Makefile Sat Sep 3 07:45:08 2022
@@ -1,6 +1,7 @@
# from: @(#)Makefile 8.1 (Berkeley) 6/4/93
-# $NetBSD: Makefile,v 1.15 2019/10/13 07:28:20 mrg Exp $
+# $NetBSD: Makefile,v 1.16 2022/09/03 07:45:08 tsutsui Exp $
+WARNS?= 5
USE_FORT?= yes # network server
PROG= rbootd
Index: src/usr.sbin/rbootd/bpf.c
diff -u src/usr.sbin/rbootd/bpf.c:1.21 src/usr.sbin/rbootd/bpf.c:1.22
--- src/usr.sbin/rbootd/bpf.c:1.21 Tue Jan 23 21:06:25 2018
+++ src/usr.sbin/rbootd/bpf.c Sat Sep 3 07:45:08 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: bpf.c,v 1.21 2018/01/23 21:06:25 sevan Exp $ */
+/* $NetBSD: bpf.c,v 1.22 2022/09/03 07:45:08 tsutsui Exp $ */
/*
* Copyright (c) 1988, 1992 The University of Utah and the Center
@@ -47,7 +47,7 @@
#if 0
static char sccsid[] = "@(#)bpf.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: bpf.c,v 1.21 2018/01/23 21:06:25 sevan Exp $");
+__RCSID("$NetBSD: bpf.c,v 1.22 2022/09/03 07:45:08 tsutsui Exp $");
#endif
#endif /* not lint */
@@ -88,7 +88,7 @@ static u_int8_t *BpfPkt = NULL;
** If an error is encountered, the program terminates here.
*/
int
-BpfOpen()
+BpfOpen(void)
{
struct ifreq ifr;
u_int bufsize = 32768;
@@ -368,7 +368,7 @@ BpfWrite(RMPCONN *rconn)
** None.
*/
void
-BpfClose()
+BpfClose(void)
{
struct ifreq ifr;
Index: src/usr.sbin/rbootd/parseconf.c
diff -u src/usr.sbin/rbootd/parseconf.c:1.12 src/usr.sbin/rbootd/parseconf.c:1.13
--- src/usr.sbin/rbootd/parseconf.c:1.12 Tue Jan 23 21:06:25 2018
+++ src/usr.sbin/rbootd/parseconf.c Sat Sep 3 07:45:08 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: parseconf.c,v 1.12 2018/01/23 21:06:25 sevan Exp $ */
+/* $NetBSD: parseconf.c,v 1.13 2022/09/03 07:45:08 tsutsui Exp $ */
/*
* Copyright (c) 1988, 1992 The University of Utah and the Center
@@ -47,7 +47,7 @@
#if 0
static char sccsid[] = "@(#)parseconf.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: parseconf.c,v 1.12 2018/01/23 21:06:25 sevan Exp $");
+__RCSID("$NetBSD: parseconf.c,v 1.13 2022/09/03 07:45:08 tsutsui Exp $");
#endif
#endif /* not lint */
@@ -81,7 +81,7 @@ __RCSID("$NetBSD: parseconf.c,v 1.12 201
** to create a linked list of default boot files.
*/
int
-ParseConfig()
+ParseConfig(void)
{
FILE *fp;
CLIENT *client;
@@ -309,7 +309,7 @@ ParseAddr(char *str)
** called to re-order its list of boot file pointers.
*/
int
-GetBootFiles()
+GetBootFiles(void)
{
DIR *dfd;
struct stat statb;
Index: src/usr.sbin/rbootd/utils.c
diff -u src/usr.sbin/rbootd/utils.c:1.18 src/usr.sbin/rbootd/utils.c:1.19
--- src/usr.sbin/rbootd/utils.c:1.18 Tue Jan 23 21:06:25 2018
+++ src/usr.sbin/rbootd/utils.c Sat Sep 3 07:45:08 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: utils.c,v 1.18 2018/01/23 21:06:25 sevan Exp $ */
+/* $NetBSD: utils.c,v 1.19 2022/09/03 07:45:08 tsutsui Exp $ */
/*
* Copyright (c) 1988, 1992 The University of Utah and the Center
@@ -47,7 +47,7 @@
#if 0
static char sccsid[] = "@(#)utils.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: utils.c,v 1.18 2018/01/23 21:06:25 sevan Exp $");
+__RCSID("$NetBSD: utils.c,v 1.19 2022/09/03 07:45:08 tsutsui Exp $");
#endif
#endif /* not lint */
@@ -302,7 +302,7 @@ NewClient(u_int8_t *addr)
** - This routine must be called with SIGHUP blocked.
*/
void
-FreeClients()
+FreeClients(void)
{
CLIENT *ctmp;
@@ -434,7 +434,7 @@ FreeConn(RMPCONN *rtmp)
** - This routine must be called with SIGHUP blocked.
*/
void
-FreeConns()
+FreeConns(void)
{
RMPCONN *rtmp;
CVS commit: src/usr.sbin/rbootd
Module Name:src Committed By: tsutsui Date: Sat Sep 3 07:45:08 UTC 2022 Modified Files: src/usr.sbin/rbootd: Makefile bpf.c parseconf.c utils.c Log Message: Make build with WARNS=5. To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/usr.sbin/rbootd/Makefile cvs rdiff -u -r1.21 -r1.22 src/usr.sbin/rbootd/bpf.c cvs rdiff -u -r1.12 -r1.13 src/usr.sbin/rbootd/parseconf.c cvs rdiff -u -r1.18 -r1.19 src/usr.sbin/rbootd/utils.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
