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 52b0fef9718b9d0459192631a8e609bacfb48636..2af7425e290a4dbe192c5fe6927e036c16bbfc60 100644 (file)
--- 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 4dd01b1d56afc27c4cf4278085c32789b720b178..c986fbd1dcc807a82ebd420c50d5b9b619a78f26 100644 (file)
--- 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 cfffb1574bd7b36932c9ef5140e1e97d7e4dbe83..b44b4bf3c414eb3117a19295092b06997521fc64 100644 (file)
--- 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 c3548fe50dc6e6db1dd25c1de20780a761ceb570..4e73b2d5d26567b2204de24c50079044acbe034e 100644 (file)
--- 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)