diff options
| author | Tilghman Lesher <tilghman@meg.abyt.es> | 2006-09-21 20:23:32 +0000 |
|---|---|---|
| committer | Tilghman Lesher <tilghman@meg.abyt.es> | 2006-09-21 20:23:32 +0000 |
| commit | 0b74986565463dc8347b4c9afe0299088a60bebf (patch) | |
| tree | 6c9b9ba820ab079597450859670520182a5326a9 /apps/app_voicemail.c | |
| parent | 4a58847fe295e62ac359b83c9f5d81e622230f35 (diff) | |
More removal of deprecated stuff
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@43446 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps/app_voicemail.c')
| -rw-r--r-- | apps/app_voicemail.c | 41 |
1 files changed, 2 insertions, 39 deletions
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index a66eb282f..fd4a391f3 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -6492,7 +6492,6 @@ static int vm_exec(struct ast_channel *chan, void *data) char *tmp; struct leave_vm_options leave_options; struct ast_flags flags = { 0 }; - static int deprecate_warning = 0; char *opts[OPT_ARG_ARRAY_SIZE]; AST_DECLARE_APP_ARGS(args, AST_APP_ARG(argv0); @@ -6526,32 +6525,6 @@ static int vm_exec(struct ast_channel *chan, void *data) leave_options.record_gain = (signed char) gain; } } - } else { - /* old style options parsing */ - int old = 0; - char *orig_argv0 = args.argv0; - while (*(args.argv0)) { - if (*(args.argv0) == 's') { - old = 1; - ast_set_flag(&leave_options, OPT_SILENT); - } else if (*(args.argv0) == 'b') { - old = 1; - ast_set_flag(&leave_options, OPT_BUSY_GREETING); - } else if (*(args.argv0) == 'u') { - old = 1; - ast_set_flag(&leave_options, OPT_UNAVAIL_GREETING); - } else if (*(args.argv0) == 'j') { - old = 1; - ast_set_flag(&leave_options, OPT_PRIORITY_JUMP); - } else - break; - (args.argv0)++; - } - if (!deprecate_warning && old) { - deprecate_warning = 1; - ast_log(LOG_WARNING, "Prefixing the mailbox with an option is deprecated ('%s').\n", orig_argv0); - ast_log(LOG_WARNING, "Please move all leading options to the second argument.\n"); - } } } else { char tmp[256]; @@ -6825,24 +6798,14 @@ static char *complete_voicemail_show_users(const char *line, const char *word, i return NULL; } -static struct ast_cli_entry cli_show_voicemail_users_deprecated = { - { "show", "voicemail", "users", NULL }, - handle_voicemail_show_users, NULL, - NULL, complete_voicemail_show_users }; - -static struct ast_cli_entry cli_show_voicemail_zones_deprecated = { - { "show", "voicemail", "zones", NULL }, - handle_voicemail_show_zones, NULL, - NULL, NULL }; - static struct ast_cli_entry cli_voicemail[] = { { { "voicemail", "list", "users", NULL }, handle_voicemail_show_users, "List defined voicemail boxes", - voicemail_show_users_help, complete_voicemail_show_users, &cli_show_voicemail_users_deprecated }, + voicemail_show_users_help, complete_voicemail_show_users, NULL }, { { "voicemail", "list", "zones", NULL }, handle_voicemail_show_zones, "List zone message formats", - voicemail_show_zones_help, NULL, &cli_show_voicemail_zones_deprecated }, + voicemail_show_zones_help, NULL, NULL }, }; static int load_config(void) |