mirror of
				https://github.com/asterisk/asterisk.git
				synced 2025-10-31 10:47:18 +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:
		| @@ -387,7 +387,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, | ||||
| @@ -445,7 +445,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) | ||||
|   | ||||
		Reference in New Issue
	
	Block a user