mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-05 04:32:44 +00:00
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
This commit is contained in:
@@ -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);
|
||||
|
Reference in New Issue
Block a user