Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 21 May 2020 01:55:10 +0000 (UTC)
From:      Kyle Evans <kevans@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org
Subject:   svn commit: r361312 - stable/12/tests/sys/netpfil/pf/ioctl
Message-ID:  <202005210155.04L1tA8l061959@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: kevans
Date: Thu May 21 01:55:10 2020
New Revision: 361312
URL: https://svnweb.freebsd.org/changeset/base/361312

Log:
  MFC r361065: pf tests: fix up a couple WARNS= 6 nits
  
  common_init_tbl is only used within this single CU, so it should be marked
  static.
  
  WARNS=6 also complained about the var defined by
  `ATF_TC_WITH_CLEANUP(getastats);` being unused, which turns out to be
  because it's not been hooked up in ATF_TP_ADD_TCS. kp@ did not immediately
  recall any reason for this, and the case passes on my local system, so hook
  it up.
  
  Note that I've not yet set WARNS= 6 here. Investigation is underway to see
  if we can feasibly default WARNS to 6 for src builds to catch directories
  too deep to inherit a WARNS from the top-level subdirectories' Makefile.inc.
  Those particular WARNS settings will be subsequently removed as they become
  redundant with a more-global default.

Modified:
  stable/12/tests/sys/netpfil/pf/ioctl/validation.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/tests/sys/netpfil/pf/ioctl/validation.c
==============================================================================
--- stable/12/tests/sys/netpfil/pf/ioctl/validation.c	Thu May 21 01:53:03 2020	(r361311)
+++ stable/12/tests/sys/netpfil/pf/ioctl/validation.c	Thu May 21 01:55:10 2020	(r361312)
@@ -51,7 +51,7 @@ static int dev;
 #define COMMON_CLEANUP() \
 	close(dev);
 
-void
+static void
 common_init_tbl(struct pfr_table *tbl)
 {
 	bzero(tbl, sizeof(struct pfr_table));
@@ -795,6 +795,7 @@ ATF_TP_ADD_TCS(tp)
 	ATF_TP_ADD_TC(tp, addtables);
 	ATF_TP_ADD_TC(tp, deltables);
 	ATF_TP_ADD_TC(tp, gettables);
+	ATF_TP_ADD_TC(tp, getastats);
 	ATF_TP_ADD_TC(tp, gettstats);
 	ATF_TP_ADD_TC(tp, clrtstats);
 	ATF_TP_ADD_TC(tp, settflags);



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202005210155.04L1tA8l061959>