Merged revisions 273714 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

........
  r273714 | tilghman | 2010-07-02 11:57:28 -0500 (Fri, 02 Jul 2010) | 2 lines

  The switch fallthrough could create some errorneous situations, so best to force directly to the default case.
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@273716 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_queue.c b/apps/app_queue.c
index 979ae9c86ac3d6eed194e0bab9b4ff504bb674ca..ec57584b2a2afd50633591935977230a629a0a2c 100644 (file)
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -967,22 +967,27 @@ static int get_member_status(struct call_queue *q, int max_penalty, int min_pena
                                ast_debug(4, "%s is unavailable because his device state is 'invalid'\n", member->membername);
                                break;
                        }
+                       goto default_case;
                case AST_DEVICE_UNAVAILABLE:
                        if (conditions & QUEUE_EMPTY_UNAVAILABLE) {
                                ast_debug(4, "%s is unavailable because his device state is 'unavailable'\n", member->membername);
                                break;
                        }
+                       goto default_case;
                case AST_DEVICE_INUSE:
                        if (conditions & QUEUE_EMPTY_INUSE) {
                                ast_debug(4, "%s is unavailable because his device state is 'inuse'\n", member->membername);
                                break;
                        }
+                       goto default_case;
                case AST_DEVICE_UNKNOWN:
                        if (conditions & QUEUE_EMPTY_UNKNOWN) {
                                ast_debug(4, "%s is unavailable because his device state is 'unknown'\n", member->membername);
                                break;
                        }
+                       /* Fall-through */
                default:
+               default_case:
                        if (member->paused && (conditions & QUEUE_EMPTY_PAUSED)) {
                                ast_debug(4, "%s is unavailable because he is paused'\n", member->membername);
                                break;