Module Name: src
Committed By: martin
Date: Fri Aug 18 13:18:17 UTC 2023
Modified Files:
src/usr.bin/netstat: bpf.c main.c netstat.h
Log Message:
Rename local bpf_* functions to nsbpf_* to avoid conflicts with
new libpcap bpf_* functions
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/usr.bin/netstat/bpf.c
cvs rdiff -u -r1.104 -r1.105 src/usr.bin/netstat/main.c
cvs rdiff -u -r1.53 -r1.54 src/usr.bin/netstat/netstat.h
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/netstat/bpf.c
diff -u src/usr.bin/netstat/bpf.c:1.17 src/usr.bin/netstat/bpf.c:1.18
--- src/usr.bin/netstat/bpf.c:1.17 Sat Nov 19 08:56:20 2022
+++ src/usr.bin/netstat/bpf.c Fri Aug 18 13:18:17 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: bpf.c,v 1.17 2022/11/19 08:56:20 yamt Exp $ */
+/* $NetBSD: bpf.c,v 1.18 2023/08/18 13:18:17 martin Exp $ */
/*
* Copyright (c) 2005 The NetBSD Foundation, Inc.
@@ -47,7 +47,7 @@
#include "prog_ops.h"
void
-bpf_stats(void)
+nsbpf_stats(void)
{
struct bpf_stat bpf_s;
size_t len = sizeof(bpf_s);
@@ -69,7 +69,7 @@ bpf_stats(void)
}
void
-bpf_dump(const char *bpfif)
+nsbpf_dump(const char *bpfif)
{
struct bpf_d_ext *dpe;
Index: src/usr.bin/netstat/main.c
diff -u src/usr.bin/netstat/main.c:1.104 src/usr.bin/netstat/main.c:1.105
--- src/usr.bin/netstat/main.c:1.104 Mon Oct 24 08:11:25 2022
+++ src/usr.bin/netstat/main.c Fri Aug 18 13:18:17 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.104 2022/10/24 08:11:25 msaitoh Exp $ */
+/* $NetBSD: main.c,v 1.105 2023/08/18 13:18:17 martin Exp $ */
/*
* Copyright (c) 1983, 1988, 1993
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 19
#if 0
static char sccsid[] = "from: @(#)main.c 8.4 (Berkeley) 3/1/94";
#else
-__RCSID("$NetBSD: main.c,v 1.104 2022/10/24 08:11:25 msaitoh Exp $");
+__RCSID("$NetBSD: main.c,v 1.105 2023/08/18 13:18:17 martin Exp $");
#endif
#endif /* not lint */
@@ -560,9 +560,9 @@ main(int argc, char *argv[])
#ifndef SMALL
if (Bflag) {
if (sflag)
- bpf_stats();
+ nsbpf_stats();
else
- bpf_dump(interface);
+ nsbpf_dump(interface);
exit(0);
}
#endif
Index: src/usr.bin/netstat/netstat.h
diff -u src/usr.bin/netstat/netstat.h:1.53 src/usr.bin/netstat/netstat.h:1.54
--- src/usr.bin/netstat/netstat.h:1.53 Thu Sep 1 10:10:20 2022
+++ src/usr.bin/netstat/netstat.h Fri Aug 18 13:18:17 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: netstat.h,v 1.53 2022/09/01 10:10:20 msaitoh Exp $ */
+/* $NetBSD: netstat.h,v 1.54 2023/08/18 13:18:17 martin Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -137,8 +137,8 @@ void routepr(u_long);
void mroutepr(u_long, u_long, u_long, u_long);
void mrt_stats(u_long, u_long);
-void bpf_stats(void);
-void bpf_dump(const char *);
+void nsbpf_stats(void);
+void nsbpf_dump(const char *);
kvm_t *get_kvmd(void);
