[src/trunk]: src/tests/kernel/kqueue Avoid hard-coding names and limits so th...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/2904e87b8b62
branches:  trunk
changeset: 956496:2904e87b8b62
user:      christos <christos%NetBSD.org@localhost>
date:      Sat Oct 31 14:57:02 2020 +0000

description:
Avoid hard-coding names and limits so this will not break again.

diffstat:

 tests/kernel/kqueue/t_ioctl.c |  25 +++++++------------------
 1 files changed, 7 insertions(+), 18 deletions(-)

diffs (67 lines):

diff -r ed8506d8f5e5 -r 2904e87b8b62 tests/kernel/kqueue/t_ioctl.c
--- a/tests/kernel/kqueue/t_ioctl.c     Sat Oct 31 14:55:52 2020 +0000
+++ b/tests/kernel/kqueue/t_ioctl.c     Sat Oct 31 14:57:02 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: t_ioctl.c,v 1.4 2018/01/09 17:35:29 martin Exp $ */
+/* $NetBSD: t_ioctl.c,v 1.5 2020/10/31 14:57:02 christos Exp $ */
 
 /*-
  * Copyright (c) 2002, 2008 The NetBSD Foundation, Inc.
@@ -32,8 +32,9 @@
 #include <sys/cdefs.h>
 __COPYRIGHT("@(#) Copyright (c) 2008\
  The NetBSD Foundation, inc. All rights reserved.");
-__RCSID("$NetBSD: t_ioctl.c,v 1.4 2018/01/09 17:35:29 martin Exp $");
+__RCSID("$NetBSD: t_ioctl.c,v 1.5 2020/10/31 14:57:02 christos Exp $");
 
+#define EVFILT_NAMES
 #include <sys/event.h>
 #include <sys/ioctl.h>
 
@@ -61,13 +62,13 @@
        km.name = buf;
        km.len = sizeof(buf) - 1;
 
-       for (i = 0; i < 8; ++i) {
+       for (i = 0; i < EVFILT_SYSCOUNT; ++i) {
                km.filter = i;
                RL(ioctl(kq, KFILTER_BYFILTER, &km));
                (void)printf("  map %d -> %s\n", km.filter, km.name);
        }
 
-       km.filter = 8;
+       km.filter = EVFILT_SYSCOUNT;
        ATF_REQUIRE_EQ(ioctl(kq, KFILTER_BYFILTER, &km), -1);
 }
 
@@ -78,28 +79,16 @@
 }
 ATF_TC_BODY(kfilter_byname, tc)
 {
-       const char *tests[] = {
-               "EVFILT_READ",
-               "EVFILT_WRITE",
-               "EVFILT_AIO",
-               "EVFILT_VNODE",
-               "EVFILT_PROC",
-               "EVFILT_SIGNAL",
-               "EVFILT_TIMER",
-               "EVFILT_FS",
-               NULL
-       };
        char buf[32];
        struct kfilter_mapping km;
-       const char **test;
        int kq;
 
        RL(kq = kqueue());
 
        km.name = buf;
 
-       for (test = &tests[0]; *test != NULL; ++test) {
-               (void)strlcpy(buf, *test, sizeof(buf));
+       for (size_t i = 0; i < EVFILT_SYSCOUNT; i++) {
+               (void)strlcpy(buf, evfiltnames[i], sizeof(buf));
                RL(ioctl(kq, KFILTER_BYNAME, &km));
                (void)printf("  map %s -> %d\n", km.name, km.filter);
        }