diff options
author | Matthew Nicholson <mnicholson@digium.com> | 2009-11-30 21:21:29 +0000 |
---|---|---|
committer | Matthew Nicholson <mnicholson@digium.com> | 2009-11-30 21:21:29 +0000 |
commit | 936a2bd20247762c5016e414d0d60cd3ee53d6eb (patch) | |
tree | f41b05763249c71534fca5d5eae775d8ac4e7348 /apps | |
parent | 8d1f4fa5ead02500a192acf0cca8bbb811c7cdd9 (diff) |
Reverted 231616
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@231637 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps')
-rw-r--r-- | apps/app_voicemail.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index 673990ca4..a69b306f2 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -10617,7 +10617,7 @@ static int load_config(int reload) char *cat; struct ast_variable *var; const char *val; - char *q, *stringp, *tmp; + char *q, *stringp; int x; int tmpadsi[4]; struct ast_flags config_flags = { reload ? CONFIG_FLAG_FILEUNCHANGED : 0 }; @@ -10926,16 +10926,8 @@ static int load_config(int reload) } val = ast_variable_retrieve(cfg, "general", "format"); - if (!val) { + if (!val) val = "wav"; - } else { - tmp = ast_strdupa(val); - val = ast_format_str_reduce(tmp); - if (!val) { - ast_log(LOG_ERROR, "Error processing format string, defaulting to format 'wav'\n"); - val = "wav"; - } - } ast_copy_string(vmfmts, val, sizeof(vmfmts)); skipms = 3000; |