diff options
| author | Joshua Colp <jcolp@digium.com> | 2016-04-08 15:47:50 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2016-04-08 15:47:50 -0500 |
| commit | 8610f4344fc2d83d0926fbf45b9f77d6fc26eea5 (patch) | |
| tree | 86556572e8112be0b11cb44c344d5aa0d29a70e1 /main | |
| parent | b47dfd1c6ead5c8783660465af997a4360555ea1 (diff) | |
| parent | 6138a75e8e438bb92ef541a6339d2a20c5164fd0 (diff) | |
Merge "pbx.h: Make ast_state_cb_type take more const."
Diffstat (limited to 'main')
| -rw-r--r-- | main/manager.c | 2 | ||||
| -rw-r--r-- | main/pbx.c | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/main/manager.c b/main/manager.c index e74b253ff..74e953333 100644 --- a/main/manager.c +++ b/main/manager.c @@ -6765,7 +6765,7 @@ int ast_manager_unregister(const char *action) return 0; } -static int manager_state_cb(char *context, char *exten, struct ast_state_cb_info *info, void *data) +static int manager_state_cb(const char *context, const char *exten, struct ast_state_cb_info *info, void *data) { /* Notify managers of change */ char hint[512]; diff --git a/main/pbx.c b/main/pbx.c index b7bfdb826..df9cad326 100644 --- a/main/pbx.c +++ b/main/pbx.c @@ -3231,8 +3231,7 @@ static int execute_state_callback(ast_state_cb_type cb, info.exten_state = AST_EXTENSION_REMOVED; } - /* NOTE: The casts will not be needed for v10 and later */ - res = cb((char *) context, (char *) exten, &info, data); + res = cb(context, exten, &info, data); return res; } |