]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
use 'switch' insteaf of multiple 'if'
authorLuigi Rizzo <rizzo@icir.org>
Wed, 10 May 2006 10:10:03 +0000 (10:10 +0000)
committerLuigi Rizzo <rizzo@icir.org>
Wed, 10 May 2006 10:10:03 +0000 (10:10 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@26345 65c4cc65-6c06-0410-ace0-fbb531ad65f3

apps/app_voicemail.c

index 063eff45bb2059ee53320c5d7bd71cb59e3877b9..884cbdd8811be80ae84e75f05ac233f09ee2730d 100644 (file)
@@ -6192,7 +6192,7 @@ static int load_config(void)
 
        AST_LIST_LOCK(&users);
        while ((cur = AST_LIST_REMOVE_HEAD(&users, list))) {
-               ast_set_flag(cur, VM_ALLOCED);  
+               ast_set_flag(cur, VM_ALLOCED);
                free_user(cur);
        }
 
@@ -6752,16 +6752,17 @@ static int advanced_options(struct ast_channel *chan, struct ast_vm_user *vmu, s
        if (!strncasecmp("macro",context,5)) /* Macro names in contexts are useless for our needs */
                context = ast_variable_retrieve(msg_cfg, "message","macrocontext");
 
-       if (option == 3) {
-
+       switch (option) {
+       case 3:
                if (!res)
                        res = play_message_datetime(chan, vmu, origtime, filename);
                if (!res)
                        res = play_message_callerid(chan, vms, cid, context, 0);
 
                res = 't';
+               break;
 
-       } else if (option == 2) { /* Call back */
+       case 2: /* Call back */
 
                if (!ast_strlen_zero(cid)) {
                        ast_callerid_parse(cid, &name, &num);
@@ -6843,9 +6844,9 @@ static int advanced_options(struct ast_channel *chan, struct ast_vm_user *vmu, s
                                                res = -1;
                                }
                        }
+               break;
 
-       }
-       else if (option == 1) { /* Reply */
+       case 1: /* Reply */
                /* Send reply directly to sender */
                if (!ast_strlen_zero(cid)) {
                        ast_callerid_parse(cid, &name, &num);
@@ -6881,6 +6882,7 @@ static int advanced_options(struct ast_channel *chan, struct ast_vm_user *vmu, s
                        } 
                        res = 0;
                }
+               break;
        }
 
        ast_config_destroy(msg_cfg);