diff options
| author | zuul <zuul@gerrit.asterisk.org> | 2017-01-05 10:30:32 -0600 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2017-01-05 10:30:32 -0600 |
| commit | 6962a13466c5e5b42e029f6d79da5262565317b3 (patch) | |
| tree | a643a8cd5edf48083294987b5151494c8f18a9e9 /res | |
| parent | c5f406f76383ecce455e42303b614b4a3bd3981e (diff) | |
| parent | d96e3502564508bf753aa637c5e1a0311924ab3d (diff) | |
Merge "core/pbx: dialplan show - display filename/line#"
Diffstat (limited to 'res')
| -rw-r--r-- | res/ael/pval.c | 4 | ||||
| -rw-r--r-- | res/parking/parking_bridge_features.c | 2 | ||||
| -rw-r--r-- | res/res_parking.c | 2 | ||||
| -rw-r--r-- | res/res_pjsip_config_wizard.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/res/ael/pval.c b/res/ael/pval.c index 6803ab634..b0a04fe2f 100644 --- a/res/ael/pval.c +++ b/res/ael/pval.c @@ -4234,7 +4234,7 @@ void add_extensions(struct ael_extension *exten) pbx_substitute_variables_helper(NULL, exten->name, realext, sizeof(realext) - 1); if (exten->hints) { if (ast_add_extension2(exten->context, 0 /*no replace*/, realext, PRIORITY_HINT, NULL, exten->cidmatch, - exten->hints, NULL, ast_free_ptr, registrar)) { + exten->hints, NULL, ast_free_ptr, registrar, NULL, 0)) { ast_log(LOG_WARNING, "Unable to add step at priority 'hint' of extension '%s'\n", exten->name); } @@ -4314,7 +4314,7 @@ void add_extensions(struct ael_extension *exten) label = 0; if (ast_add_extension2(exten->context, 0 /*no replace*/, realext, pr->priority_num, (label?label:NULL), exten->cidmatch, - app, strdup(appargs), ast_free_ptr, registrar)) { + app, strdup(appargs), ast_free_ptr, registrar, NULL, 0)) { ast_log(LOG_WARNING, "Unable to add step at priority '%d' of extension '%s'\n", pr->priority_num, exten->name); } diff --git a/res/parking/parking_bridge_features.c b/res/parking/parking_bridge_features.c index 3fa7e42b3..277023333 100644 --- a/res/parking/parking_bridge_features.c +++ b/res/parking/parking_bridge_features.c @@ -633,7 +633,7 @@ static int parking_duration_callback(struct ast_bridge_channel *bridge_channel, ast_debug(3, "An extension for '%s@%s' was already registered by another registrar '%s'\n", dial_string_flat, PARK_DIAL_CONTEXT, ast_get_extension_registrar(existing_exten)); } else if (ast_add_extension2_nolock(park_dial_context, 1, dial_string_flat, 1, NULL, NULL, - "Dial", duplicate_returnexten, ast_free_ptr, BASE_REGISTRAR)) { + "Dial", duplicate_returnexten, ast_free_ptr, BASE_REGISTRAR, NULL, 0)) { ast_free(duplicate_returnexten); ast_log(LOG_ERROR, "Failed to create parking redial parker extension %s@%s - Dial(%s)\n", dial_string_flat, PARK_DIAL_CONTEXT, returnexten); diff --git a/res/res_parking.c b/res/res_parking.c index 171fdce61..94cdb0e6d 100644 --- a/res/res_parking.c +++ b/res/res_parking.c @@ -721,7 +721,7 @@ static int parking_add_extension(struct ast_context *context, int replace, const } if (ast_add_extension2_nolock(context, replace, extension, priority, NULL, NULL, - application, data_duplicate, ast_free_ptr, registrar)) { + application, data_duplicate, ast_free_ptr, registrar, NULL, 0)) { ast_free(data_duplicate); return -1; } diff --git a/res/res_pjsip_config_wizard.c b/res/res_pjsip_config_wizard.c index 2441184a2..83e282821 100644 --- a/res/res_pjsip_config_wizard.c +++ b/res/res_pjsip_config_wizard.c @@ -461,7 +461,7 @@ static int add_extension(struct ast_context *context, const char *exten, } if (ast_add_extension2_nolock(context, 0, exten, priority, NULL, NULL, - app, data, free_ptr, BASE_REGISTRAR)) { + app, data, free_ptr, BASE_REGISTRAR, NULL, 0)) { ast_free(data); return -1; } |