From owner-svn-src-projects@FreeBSD.ORG Wed Apr 4 08:47:37 2012 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2EA0D106566B; Wed, 4 Apr 2012 08:47:37 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 1A5538FC14; Wed, 4 Apr 2012 08:47:37 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q348lapJ093938; Wed, 4 Apr 2012 08:47:36 GMT (envelope-from glebius@svn.freebsd.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q348laZk093936; Wed, 4 Apr 2012 08:47:36 GMT (envelope-from glebius@svn.freebsd.org) Message-Id: <201204040847.q348laZk093936@svn.freebsd.org> From: Gleb Smirnoff Date: Wed, 4 Apr 2012 08:47:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r233866 - projects/pf/head/usr.bin/netstat X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Apr 2012 08:47:37 -0000 Author: glebius Date: Wed Apr 4 08:47:36 2012 New Revision: 233866 URL: http://svn.freebsd.org/changeset/base/233866 Log: In pfsync stats print last couple of lines in a plural form optionally. > Description of fields to fill in above: 76 columns --| > PR: If a GNATS PR is affected by the change. > Submitted by: If someone else sent in the change. > Reviewed by: If someone else reviewed your modification. > Approved by: If you needed approval for this commit. > Obtained from: If the change is from a third party. > MFC after: N [day[s]|week[s]|month[s]]. Request a reminder email. > Security: Vulnerability reference (one per line) or description. > Empty fields above will be automatically removed. M netstat/if.c Modified: projects/pf/head/usr.bin/netstat/if.c Modified: projects/pf/head/usr.bin/netstat/if.c ============================================================================== --- projects/pf/head/usr.bin/netstat/if.c Wed Apr 4 08:39:55 2012 (r233865) +++ projects/pf/head/usr.bin/netstat/if.c Wed Apr 4 08:47:36 2012 (r233866) @@ -106,8 +106,6 @@ pfsync_stats(u_long off, const char *nam #define p(f, m) if (pfsyncstat.f || sflag <= 1) \ printf(m, (uintmax_t)pfsyncstat.f, plural(pfsyncstat.f)) -#define p2(f, m) if (pfsyncstat.f || sflag <= 1) \ - printf(m, (uintmax_t)pfsyncstat.f) p(pfsyncs_ipackets, "\t%ju packet%s received (IPv4)\n"); p(pfsyncs_ipackets6, "\t%ju packet%s received (IPv6)\n"); @@ -123,8 +121,8 @@ pfsync_stats(u_long off, const char *nam p(pfsyncs_badstate, "\t\t%ju failed state lookup/insert%s\n"); p(pfsyncs_opackets, "\t%ju packet%s sent (IPv4)\n"); p(pfsyncs_opackets6, "\t%ju packet%s sent (IPv6)\n"); - p2(pfsyncs_onomem, "\t\t%ju send failed due to mbuf memory error\n"); - p2(pfsyncs_oerrors, "\t\t%ju send error\n"); + p(pfsyncs_onomem, "\t\t%ju failure%s due to mbuf memory error\n"); + p(pfsyncs_oerrors, "\t\t%ju send error%s\n"); #undef p #undef p2 }