From: Michał Kępień <michal@isc.org>
Date: Thu, 18 May 2023 13:12:23 +0000 (+0200)
Subject: Remove <isc/cmocka.h>
X-Git-Tag: v9.19.14~41^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6029010dd2a7f369026fcb29d00e0095f04d6189;p=thirdparty%2Fbind9.git

Remove <isc/cmocka.h>

The last use of the cmocka_add_test_byname() helper macro was removed in
commit 63fe9312ff8f54bc79e399bdbd5aaa15cd3e5459.  Remove the
<isc/cmocka.h> header that defines it.
---

diff --git a/lib/isc/Makefile.am b/lib/isc/Makefile.am
index 3d9f7366a1b..4f8880dfb87 100644
--- a/lib/isc/Makefile.am
+++ b/lib/isc/Makefile.am
@@ -16,7 +16,6 @@ libisc_la_HEADERS =			\
 	include/isc/base32.h		\
 	include/isc/base64.h		\
 	include/isc/buffer.h		\
-	include/isc/cmocka.h		\
 	include/isc/commandline.h	\
 	include/isc/condition.h		\
 	include/isc/counter.h		\
diff --git a/lib/isc/include/isc/cmocka.h b/lib/isc/include/isc/cmocka.h
deleted file mode 100644
index de86d5ad4d5..00000000000
--- a/lib/isc/include/isc/cmocka.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- *
- * SPDX-License-Identifier: MPL-2.0
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, you can obtain one at https://mozilla.org/MPL/2.0/.
- *
- * See the COPYRIGHT file distributed with this work for additional
- * information regarding copyright ownership.
- */
-
-/*! \file isc/cmocka.h */
-
-#pragma once
-
-#include <cmocka.h>
-
-#include <isc/lang.h>
-
-ISC_LANG_BEGINDECLS
-
-/*
- * Copy the test identified by 'name' from 'tests' to 'selected'.
- */
-#define cmocka_add_test_byname(tests, name, selected)                          \
-	_cmocka_add_test_byname(tests, sizeof(tests) / sizeof(tests[0]), name, \
-				selected,                                      \
-				sizeof(selected) / sizeof(selected[0]))
-
-static inline bool
-_cmocka_add_test_byname(const struct CMUnitTest *tests, size_t ntests,
-			const char *name, struct CMUnitTest *selected,
-			size_t nselected) {
-	size_t i, j;
-
-	for (i = 0; i < ntests && tests[i].name != NULL; i++) {
-		if (strcmp(tests[i].name, name) != 0) {
-			continue;
-		}
-		for (j = 0; j < nselected && selected[j].name != NULL; j++) {
-			if (strcmp(tests[j].name, name) == 0) {
-				break;
-			}
-		}
-		if (j < nselected && selected[j].name == NULL) {
-			selected[j] = tests[i];
-		}
-		return (true);
-	}
-	return (false);
-}
-
-ISC_LANG_ENDDECLS
diff --git a/tests/dns/rdata_test.c b/tests/dns/rdata_test.c
index 8da047b5c12..d960b529f33 100644
--- a/tests/dns/rdata_test.c
+++ b/tests/dns/rdata_test.c
@@ -23,7 +23,8 @@
 
 #define UNIT_TESTING
 
-#include <isc/cmocka.h>
+#include <cmocka.h>
+
 #include <isc/commandline.h>
 #include <isc/hex.h>
 #include <isc/lex.h>