Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/usr.bin/netstat remove unused



details:   https://anonhg.NetBSD.org/src/rev/b2e843457f8d
branches:  trunk
changeset: 1008789:b2e843457f8d
user:      christos <christos%NetBSD.org@localhost>
date:      Fri Apr 03 16:41:59 2020 +0000

description:
remove unused

diffstat:

 usr.bin/netstat/Makefile          |  13 ++++++++-----
 usr.bin/netstat/netstat_hostops.c |   9 ++-------
 usr.bin/netstat/netstat_rumpops.c |   4 ++--
 usr.bin/netstat/prog_ops.h        |  30 ------------------------------
 4 files changed, 12 insertions(+), 44 deletions(-)

diffs (102 lines):

diff -r 5353d045be31 -r b2e843457f8d usr.bin/netstat/Makefile
--- a/usr.bin/netstat/Makefile  Fri Apr 03 16:22:23 2020 +0000
+++ b/usr.bin/netstat/Makefile  Fri Apr 03 16:41:59 2020 +0000
@@ -1,10 +1,15 @@
-#      $NetBSD: Makefile,v 1.47 2019/10/13 07:28:16 mrg Exp $
+#      $NetBSD: Makefile,v 1.48 2020/04/03 16:41:59 christos Exp $
 #      from: @(#)Makefile      8.1 (Berkeley) 6/12/93
 
 .include <bsd.own.mk>
 
 USE_FORT?= yes # setgid
 
+ROUTE=${NETBSDSRCDIR}/sbin/route
+PF=${NETBSDSRCDIR}/sys/dist/pf
+
+.PATH: ${ROUTE} 
+
 RUMPPRG=netstat
 SRCS=  atalk.c bpf.c fast_ipsec.c if.c inet.c inet6.c \
        main.c mbuf.c mroute.c mroute6.c pfkey.c pfsync.c route.c \
@@ -14,10 +19,8 @@
 LDADD= -lutil -lkvm
 DPADD= ${LIBUTIL} ${LIBKVM}
 CPPFLAGS+= -DIPSEC -I${.CURDIR}
-CPPFLAGS+= -I${NETBSDSRCDIR}/sys/dist/pf
-CPPFLAGS+= -I${NETBSDSRCDIR}/sbin/route
-
-.PATH:  ${.CURDIR}/../../sbin/route
+CPPFLAGS+= -I${PF}
+CPPFLAGS+= -I${ROUTE}
 
 .if (${MKRUMP} != "no")
 .PATH:  ${.CURDIR}/../../lib/libc/gen
diff -r 5353d045be31 -r b2e843457f8d usr.bin/netstat/netstat_hostops.c
--- a/usr.bin/netstat/netstat_hostops.c Fri Apr 03 16:22:23 2020 +0000
+++ b/usr.bin/netstat/netstat_hostops.c Fri Apr 03 16:41:59 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: netstat_hostops.c,v 1.3 2020/04/03 16:20:51 martin Exp $       */
+/*     $NetBSD: netstat_hostops.c,v 1.4 2020/04/03 16:41:59 christos Exp $     */
 
 /*
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -26,9 +26,4 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-__RCSID("$NetBSD: netstat_hostops.c,v 1.3 2020/04/03 16:20:51 martin Exp $");
-#endif /* !lint */
-
-#include "../../sbin/route/route_hostops.c"
+#include "route_hostops.c"
diff -r 5353d045be31 -r b2e843457f8d usr.bin/netstat/netstat_rumpops.c
--- a/usr.bin/netstat/netstat_rumpops.c Fri Apr 03 16:22:23 2020 +0000
+++ b/usr.bin/netstat/netstat_rumpops.c Fri Apr 03 16:41:59 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: netstat_rumpops.c,v 1.3 2020/04/03 16:20:51 martin Exp $       */
+/*     $NetBSD: netstat_rumpops.c,v 1.4 2020/04/03 16:41:59 christos Exp $     */
 
 /*
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -26,4 +26,4 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "../../sbin/route/route_rumpops.c"
+#include "route_rumpops.c"
diff -r 5353d045be31 -r b2e843457f8d usr.bin/netstat/prog_ops.h
--- a/usr.bin/netstat/prog_ops.h        Fri Apr 03 16:22:23 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-/*      $NetBSD: prog_ops.h,v 1.4 2020/04/03 16:20:51 martin Exp $     */
-
-/*
- * Copyright (c) 2010 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-
-#include "../../sbin/route/prog_ops.h"



Home | Main Index | Thread Index | Old Index