diff options
Diffstat (limited to 'res/parking')
| -rw-r--r-- | res/parking/parking_applications.c | 2 | ||||
| -rw-r--r-- | res/parking/parking_bridge_features.c | 4 | ||||
| -rw-r--r-- | res/parking/parking_manager.c | 7 | ||||
| -rw-r--r-- | res/parking/res_parking.h | 9 |
4 files changed, 5 insertions, 17 deletions
diff --git a/res/parking/parking_applications.c b/res/parking/parking_applications.c index 762bf5566..507747430 100644 --- a/res/parking/parking_applications.c +++ b/res/parking/parking_applications.c @@ -868,8 +868,6 @@ static int park_and_announce_app_exec(struct ast_channel *chan, const char *data int load_parking_applications(void) { - const struct ast_module_info *ast_module_info = parking_get_module_info(); - if (ast_register_application_xml(PARK_APPLICATION, park_app_exec)) { return -1; } diff --git a/res/parking/parking_bridge_features.c b/res/parking/parking_bridge_features.c index 4a01e4cee..4cb87c81a 100644 --- a/res/parking/parking_bridge_features.c +++ b/res/parking/parking_bridge_features.c @@ -502,7 +502,7 @@ static int parking_park_call(struct ast_bridge_channel *parker, char *exten, siz static int feature_park_call(struct ast_bridge_channel *bridge_channel, void *hook_pvt) { - SCOPED_MODULE_USE(parking_get_module_info()->self); + SCOPED_MODULE_USE(AST_MODULE_SELF); return parking_park_call(bridge_channel, NULL, 0); } @@ -726,7 +726,7 @@ void unload_parking_bridge_features(void) int load_parking_bridge_features(void) { - parking_provider.module_info = parking_get_module_info(); + parking_provider.module = AST_MODULE_SELF; if (ast_parking_register_bridge_features(&parking_provider)) { return -1; diff --git a/res/parking/parking_manager.c b/res/parking/parking_manager.c index ffa4bc720..175ae5f8b 100644 --- a/res/parking/parking_manager.c +++ b/res/parking/parking_manager.c @@ -678,11 +678,10 @@ static void parking_manager_enable_stasis(void) int load_parking_manager(void) { int res; - const struct ast_module_info *module = parking_get_module_info(); - res = ast_manager_register2("Parkinglots", EVENT_FLAG_CALL, manager_parking_lot_list, module->self, NULL, NULL); - res |= ast_manager_register2("ParkedCalls", EVENT_FLAG_CALL, manager_parking_status, module->self, NULL, NULL); - res |= ast_manager_register2("Park", EVENT_FLAG_CALL, manager_park, module->self, NULL, NULL); + res = ast_manager_register_xml("Parkinglots", EVENT_FLAG_CALL, manager_parking_lot_list); + res |= ast_manager_register_xml("ParkedCalls", EVENT_FLAG_CALL, manager_parking_status); + res |= ast_manager_register_xml("Park", EVENT_FLAG_CALL, manager_park); parking_manager_enable_stasis(); return res ? -1 : 0; } diff --git a/res/parking/res_parking.h b/res/parking/res_parking.h index 3d77e514c..2c4a18055 100644 --- a/res/parking/res_parking.h +++ b/res/parking/res_parking.h @@ -560,12 +560,3 @@ int load_parking_tests(void); * \return Nothing */ void unload_parking_tests(void); - -struct ast_module_info; -/*! - * \since 12.0.0 - * \brief Get res_parking's module info - * - * \retval res_parking's ast_module - */ -const struct ast_module_info *parking_get_module_info(void); |