Merge branch 'fanf-deprecate-deprecated' into 'main'

Deprecate <isc/deprecated.h>

See merge request isc-projects/bind9!7466

CHANGES

@@ -1,3 +1,7 @@
+6100.	[cleanup]	Deprecate <isc/deprecated.h>, because obsolete
+			functions are now deleted instead of marked with
+			an attribute. [GL !7466]
+
 6099.	[performance]	Change the internal read-write lock to modified C-RW-WP
 			algorithm that is more reader-writer fair and has better
 			performance for our workloads. [GL #1609]

bin/tests/system/dyndb/driver/db.c

@@ -575,8 +575,6 @@ static dns_dbmethods_t sampledb_methods = {
 	getoriginnode,	transfernode,	getnsec3parameters,
 	findnsec3node,	setsigningtime, getsigningtime,
 	resigned,	isdnssec,	getrrsetstats,
-	NULL, /* rpz_attach */
-	NULL, /* rpz_ready */
 	findnodeext,	findext,	setcachestats,
 	hashsize,	NULL, /* nodefullname */
 	NULL,		      /* getsize */

lib/dns/db.c

@@ -975,28 +975,6 @@ dns_db_resigned(dns_db_t *db, dns_rdataset_t *rdataset,
 	}
 }
 
-/*
- * Attach a database to policy zone databases.
- * This should only happen when the caller has already ensured that
- * it is dealing with a database that understands response policy zones.
- */
-void
-dns_db_rpz_attach(dns_db_t *db, void *rpzs, uint8_t rpz_num) {
-	REQUIRE(db->methods->rpz_attach != NULL);
-	(db->methods->rpz_attach)(db, rpzs, rpz_num);
-}
-
-/*
- * Finish loading a response policy zone.
- */
-isc_result_t
-dns_db_rpz_ready(dns_db_t *db) {
-	if (db->methods->rpz_ready == NULL) {
-		return (ISC_R_SUCCESS);
-	}
-	return ((db->methods->rpz_ready)(db));
-}
-
 /*
  * Attach a notify-on-update function the database
  */

lib/dns/dnsrps.c

@@ -967,8 +967,6 @@ static dns_dbmethods_t rpsdb_db_methods = {
 	NULL, /* resigned */
 	NULL, /* isdnssec */
 	NULL, /* getrrsetstats */
-	NULL, /* rpz_attach */
-	NULL, /* rpz_ready */
 	NULL, /* findnodeext */
 	NULL, /* findext */
 	NULL, /* setcachestats */

lib/dns/include/dns/db.h

@@ -50,7 +50,6 @@
 #include <inttypes.h>
 #include <stdbool.h>
 
-#include <isc/deprecated.h>
 #include <isc/lang.h>
 #include <isc/magic.h>
 #include <isc/stats.h>
@@ -159,8 +158,6 @@ typedef struct dns_dbmethods {
 			 dns_dbversion_t *version);
 	bool (*isdnssec)(dns_db_t *db);
 	dns_stats_t *(*getrrsetstats)(dns_db_t *db);
-	void (*rpz_attach)(dns_db_t *db, void *rpzs, uint8_t rpz_num);
-	isc_result_t (*rpz_ready)(dns_db_t *db);
 	isc_result_t (*findnodeext)(dns_db_t *db, const dns_name_t *name,
 				    bool		     create,
 				    dns_clientinfomethods_t *methods,
@@ -1626,19 +1623,6 @@ dns_db_setcachestats(dns_db_t *db, isc_stats_t *stats);
  *	dns_rdatasetstats_create(); otherwise NULL.
  */
 
-void
-dns_db_rpz_attach(dns_db_t *db, void *rpzs, uint8_t rpz_num) ISC_DEPRECATED;
-/*%<
- * Attach the response policy information for a view to a database for a
- * zone for the view.
- */
-
-isc_result_t
-dns_db_rpz_ready(dns_db_t *db) ISC_DEPRECATED;
-/*%<
- * Finish loading a response policy zone.
- */
-
 isc_result_t
 dns_db_updatenotify_register(dns_db_t *db, dns_dbupdate_callback_t fn,
 			     void *fn_arg);

lib/dns/include/dns/rpz.h

@@ -21,7 +21,6 @@
 #include <inttypes.h>
 #include <stdbool.h>
 
-#include <isc/deprecated.h>
 #include <isc/event.h>
 #include <isc/ht.h>
 #include <isc/lang.h>

lib/dns/rbtdb.c

@@ -8138,8 +8138,6 @@ static dns_dbmethods_t zone_methods = { attach,
 					resigned,
 					isdnssec,
 					NULL, /* getrrsetstats */
-					NULL, /* rpz_attach */
-					NULL, /* rpz_ready */
 					NULL, /* findnodeext */
 					NULL, /* findext */
 					NULL, /* setcachestats */
@@ -8188,8 +8186,6 @@ static dns_dbmethods_t cache_methods = { attach,
 					 NULL, /* resigned */
 					 isdnssec,
 					 getrrsetstats,
-					 NULL, /* rpz_attach */
-					 NULL, /* rpz_ready */
 					 NULL, /* findnodeext */
 					 NULL, /* findext */
 					 setcachestats,

lib/dns/sdb.c

@@ -1289,8 +1289,6 @@ static dns_dbmethods_t sdb_methods = {
 	NULL,	       /* resigned */
 	NULL,	       /* isdnssec */
 	NULL,	       /* getrrsetstats */
-	NULL,	       /* rpz_attach */
-	NULL,	       /* rpz_ready */
 	findnodeext,	findext,
 	NULL, /* setcachestats */
 	NULL, /* hashsize */

lib/dns/sdlz.c

@@ -1247,8 +1247,6 @@ static dns_dbmethods_t sdlzdb_methods = {
 	NULL,				      /* resigned */
 	NULL,				      /* isdnssec */
 	NULL,				      /* getrrsetstats */
-	NULL,				      /* rpz_attach */
-	NULL,				      /* rpz_ready */
 	findnodeext,	findext,	NULL, /* setcachestats */
 	NULL,				      /* hashsize */
 	NULL,				      /* nodefullname */

lib/isc/Makefile.am

@@ -21,7 +21,6 @@ libisc_la_HEADERS =			\
 	include/isc/condition.h		\
 	include/isc/counter.h		\
 	include/isc/crc64.h		\
-	include/isc/deprecated.h	\
 	include/isc/dir.h		\
 	include/isc/dnsstream.h		\
 	include/isc/endian.h		\

lib/isc/include/isc/deprecated.h

@@ -1,20 +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.
- */
-
-#pragma once
-
-#if (__GNUC__ + 0) > 3
-#define ISC_DEPRECATED __attribute__((deprecated))
-#else		       /* if (__GNUC__ + 0) > 3 */
-#define ISC_DEPRECATED /* none */
-#endif		       /* __GNUC__ > 3*/

lib/isc/include/isc/util.h

@@ -387,11 +387,6 @@ mock_assert(const int result, const char *const expression,
 #define ISC_ALIGN(x, a) (((x) + (a)-1) & ~((uintmax_t)(a)-1))
 #endif /* ifdef __GNUC__ */
 
-/*%
- * Misc
- */
-#include <isc/deprecated.h>
-
 /*%
  * Swap
  */