svn commit: r293637 - stable/10/usr.bin/netstat

[Garrett Cooper]

Author: ngie
Date: Sun Jan 10 17:39:49 2016
New Revision: 293637
URL: https://svnweb.freebsd.org/changeset/base/293637

Log:
  Unbreak stable/10 buildworlds on arm/arm, mips/mips, mips/mips64, mips/mipsel,
  mips/mipsn32, powerpc/powerpc, powerpc/powerpc64, sparc64/sparc64 with gcc
  after r293307 (some of the BURN_BRIDGES code)
  
  MFC after: 3 days
  Pointyhat to: markj
  Sponsored by: EMC / Isilon Storage Division
  
  MFC r279017:
  
  r279017 (by glebius):
  
  Burn bridges to FreeBSD 7.x IGMP stats.

Modified:
  stable/10/usr.bin/netstat/inet.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.bin/netstat/inet.c
==============================================================================
--- stable/10/usr.bin/netstat/inet.c	Sun Jan 10 16:42:14 2016	(r293636)
+++ stable/10/usr.bin/netstat/inet.c	Sun Jan 10 17:39:49 2016	(r293637)
@@ -1039,47 +1039,6 @@ icmp_stats(u_long off, const char *name,
 	}
 }
 
-#ifndef BURN_BRIDGES
-/*
- * Dump IGMP statistics structure (pre 8.x kernel).
- */
-static void
-igmp_stats_live_old(const char *name)
-{
-	struct oigmpstat oigmpstat, zerostat;
-	size_t len = sizeof(oigmpstat);
-
-	if (zflag)
-		memset(&zerostat, 0, len);
-	if (sysctlbyname("net.inet.igmp.stats", &oigmpstat, &len,
-	    zflag ? &zerostat : NULL, zflag ? len : 0) < 0) {
-		warn("sysctl: net.inet.igmp.stats");
-		return;
-	}
-
-	printf("%s:\n", name);
-
-#define	p(f, m) if (oigmpstat.f || sflag <= 1) \
-    printf(m, oigmpstat.f, plural(oigmpstat.f))
-#define	py(f, m) if (oigmpstat.f || sflag <= 1) \
-    printf(m, oigmpstat.f, oigmpstat.f != 1 ? "ies" : "y")
-	p(igps_rcv_total, "\t%u message%s received\n");
-	p(igps_rcv_tooshort, "\t%u message%s received with too few bytes\n");
-	p(igps_rcv_badsum, "\t%u message%s received with bad checksum\n");
-	py(igps_rcv_queries, "\t%u membership quer%s received\n");
-	py(igps_rcv_badqueries,
-	    "\t%u membership quer%s received with invalid field(s)\n");
-	p(igps_rcv_reports, "\t%u membership report%s received\n");
-	p(igps_rcv_badreports,
-	    "\t%u membership report%s received with invalid field(s)\n");
-	p(igps_rcv_ourreports,
-"\t%u membership report%s received for groups to which we belong\n");
-        p(igps_snd_reports, "\t%u membership report%s sent\n");
-#undef p
-#undef py
-}
-#endif /* !BURN_BRIDGES */
-
 /*
  * Dump IGMP statistics structure.
  */