kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-02 03:02:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

channelstorage: Rename callbacks that conflict with DEBUG_FD_LEAKS.

Browse Source 
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
This commit is contained in:
George Joseph
2025-07-08 05:42:51 -06:00
committed by Ben Ford
parent dde405c067
commit 335f45f489
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
main/channelstorage.c
View File

@@ -52,7 +52,7 @@ struct ast_channelstorage_instance *ast_channelstorage_open(
{ {
struct ast_channelstorage_instance *storage_instance = NULL; 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) { if (!storage_instance) {
ast_log(LOG_ERROR, "Failed to open channel storage driver '%s'\n", ast_log(LOG_ERROR, "Failed to open channel storage driver '%s'\n",
storage_driver->driver_name); 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) 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) int channelstorage_exten_cb(void *obj, void *arg, void *data, int flags)

4
main/channelstorage.h
View File

@@ -31,7 +31,7 @@ extern "C" {
struct ast_channelstorage_driver { struct ast_channelstorage_driver {
const char *driver_name; 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( int ast_channelstorage_register_driver(
@@ -45,7 +45,7 @@ struct ast_channelstorage_driver_pvt;
struct ast_channelstorage_instance { struct ast_channelstorage_instance {
struct ast_channelstorage_driver_pvt *handle; struct ast_channelstorage_driver_pvt *handle;
void *lock_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 (*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); int (*remove)(struct ast_channelstorage_instance *driver, struct ast_channel *chan, int lock);
void (*rdlock)(struct ast_channelstorage_instance *driver); void (*rdlock)(struct ast_channelstorage_instance *driver);

4
main/channelstorage_ao2_legacy.c
View File

@@ -305,7 +305,7 @@ static void close_instance(struct ast_channelstorage_instance *driver)
static struct ast_channelstorage_instance channelstorage_instance = { static struct ast_channelstorage_instance channelstorage_instance = {
.handle = NULL, .handle = NULL,
.close = close_instance, .close_instance = close_instance,
.insert = insert_channel, .insert = insert_channel,
.remove = delete_channel, .remove = delete_channel,
.rdlock = lock_driver, .rdlock = lock_driver,
@@ -386,7 +386,7 @@ static struct ast_channelstorage_instance* get_instance(const char *name)
static struct ast_channelstorage_driver driver_type = { static struct ast_channelstorage_driver driver_type = {
.driver_name = "ao2_legacy", .driver_name = "ao2_legacy",
.open = get_instance, .open_instance = get_instance,
}; };
static void __attribute__((constructor)) __startup(void) static void __attribute__((constructor)) __startup(void)

4
main/channelstorage_cpp_map_name_id.cc
View File

@@ -388,7 +388,7 @@ static void close_instance(struct ast_channelstorage_instance *driver)
static struct ast_channelstorage_instance channelstorage_instance = { static struct ast_channelstorage_instance channelstorage_instance = {
.handle = NULL, .handle = NULL,
.lock_handle = NULL, .lock_handle = NULL,
.close = close_instance, .close_instance = close_instance,
.insert = insert_channel, .insert = insert_channel,
.remove = delete_channel, .remove = delete_channel,
.rdlock = rdlock, .rdlock = rdlock,
@@ -446,7 +446,7 @@ static struct ast_channelstorage_instance* get_instance(const char *name)
static struct ast_channelstorage_driver driver_type = { static struct ast_channelstorage_driver driver_type = {
.driver_name = "cpp_map_name_id", .driver_name = "cpp_map_name_id",
.open = get_instance, .open_instance = get_instance,
}; };
static void __attribute__((constructor)) __startup(void) static void __attribute__((constructor)) __startup(void)