From: George Joseph <gjoseph@sangoma.com>
Date: Tue, 8 Jul 2025 11:42:51 +0000 (-0600)
Subject: channelstorage: Rename callbacks that conflict with DEBUG_FD_LEAKS.
X-Git-Tag: 21.10.0-rc3~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=335f45f489b77c2e6262361a0ea6a37a5fac15e7;p=thirdparty%2Fasterisk.git

channelstorage: Rename callbacks that conflict with DEBUG_FD_LEAKS.

DEBUG_FD_LEAKS replaces calls to "open" and "close" with functions that keep
track of file descriptors, even when those calls are actually callbacks
defined in structures like ast_channelstorage_instance->open and don't touch
file descriptors.  This causes compilation failures.  Those callbacks
have been renamed to "open_instance" and "close_instance" respectively.

Resolves: #1287
---

diff --git a/main/channelstorage.c b/main/channelstorage.c
index 52b0fef971..2af7425e29 100644
--- a/main/channelstorage.c
+++ b/main/channelstorage.c
@@ -52,7 +52,7 @@ struct ast_channelstorage_instance *ast_channelstorage_open(
 {
 	struct ast_channelstorage_instance *storage_instance = NULL;
 
-	storage_instance = storage_driver->open(instance_name);
+	storage_instance = storage_driver->open_instance(instance_name);
 	if (!storage_instance) {
 		ast_log(LOG_ERROR, "Failed to open channel storage driver '%s'\n",
 			storage_driver->driver_name);
@@ -64,7 +64,7 @@ struct ast_channelstorage_instance *ast_channelstorage_open(
 
 void ast_channelstorage_close(struct ast_channelstorage_instance *storage_instance)
 {
-	CHANNELSTORAGE_API(storage_instance, close);
+	CHANNELSTORAGE_API(storage_instance, close_instance);
 };
 
 int channelstorage_exten_cb(void *obj, void *arg, void *data, int flags)
diff --git a/main/channelstorage.h b/main/channelstorage.h
index 4dd01b1d56..c986fbd1dc 100644
--- a/main/channelstorage.h
+++ b/main/channelstorage.h
@@ -31,7 +31,7 @@ extern "C" {
 
 struct ast_channelstorage_driver {
 	const char *driver_name;
-	struct ast_channelstorage_instance* (*open)(const char *instance_name);
+	struct ast_channelstorage_instance* (*open_instance)(const char *instance_name);
 };
 
 int ast_channelstorage_register_driver(
@@ -45,7 +45,7 @@ struct ast_channelstorage_driver_pvt;
 struct ast_channelstorage_instance {
 	struct ast_channelstorage_driver_pvt *handle;
 	void *lock_handle;
-	void (*close)(struct ast_channelstorage_instance *driver);
+	void (*close_instance)(struct ast_channelstorage_instance *driver);
 	int (*insert)(struct ast_channelstorage_instance *driver, struct ast_channel *chan, int flags, int lock);
 	int (*remove)(struct ast_channelstorage_instance *driver, struct ast_channel *chan, int lock);
 	void (*rdlock)(struct ast_channelstorage_instance *driver);
diff --git a/main/channelstorage_ao2_legacy.c b/main/channelstorage_ao2_legacy.c
index cfffb1574b..b44b4bf3c4 100644
--- a/main/channelstorage_ao2_legacy.c
+++ b/main/channelstorage_ao2_legacy.c
@@ -305,7 +305,7 @@ static void close_instance(struct ast_channelstorage_instance *driver)
 
 static struct ast_channelstorage_instance channelstorage_instance = {
 	.handle = NULL,
-	.close = close_instance,
+	.close_instance = close_instance,
 	.insert = insert_channel,
 	.remove = delete_channel,
 	.rdlock = lock_driver,
@@ -386,7 +386,7 @@ static struct ast_channelstorage_instance* get_instance(const char *name)
 
 static struct ast_channelstorage_driver driver_type = {
 	.driver_name = "ao2_legacy",
-	.open = get_instance,
+	.open_instance = get_instance,
 };
 
 static void __attribute__((constructor)) __startup(void)
diff --git a/main/channelstorage_cpp_map_name_id.cc b/main/channelstorage_cpp_map_name_id.cc
index c3548fe50d..4e73b2d5d2 100644
--- a/main/channelstorage_cpp_map_name_id.cc
+++ b/main/channelstorage_cpp_map_name_id.cc
@@ -388,7 +388,7 @@ static void close_instance(struct ast_channelstorage_instance *driver)
 static struct ast_channelstorage_instance channelstorage_instance = {
 	.handle = NULL,
 	.lock_handle = NULL,
-	.close = close_instance,
+	.close_instance = close_instance,
 	.insert = insert_channel,
 	.remove = delete_channel,
 	.rdlock = rdlock,
@@ -446,7 +446,7 @@ static struct ast_channelstorage_instance* get_instance(const char *name)
 
 static struct ast_channelstorage_driver driver_type = {
 	.driver_name = "cpp_map_name_id",
-	.open = get_instance,
+	.open_instance = get_instance,
 };
 
 static void __attribute__((constructor)) __startup(void)