[asterisk-commits] mmichelson: branch 1.8 r365460 - in /branches/1.8: channels/ main/ res/

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Mon May  7 11:01:28 2012
New Revision: 365460

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=365460
Log:
Fix findings 0-3, 5, and 8 for Coverity MISSING_BREAK errors.

(Issue ASTERISK-19662)


Modified:
    branches/1.8/channels/sig_analog.c
    branches/1.8/main/abstract_jb.c
    branches/1.8/main/audiohook.c
    branches/1.8/res/res_agi.c
    branches/1.8/res/res_speech.c

Modified: branches/1.8/channels/sig_analog.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/channels/sig_analog.c?view=diff&rev=365460&r1=365459&r2=365460
==============================================================================
--- branches/1.8/channels/sig_analog.c (original)
+++ branches/1.8/channels/sig_analog.c Mon May  7 11:01:28 2012
@@ -2787,6 +2787,7 @@
 	case ANALOG_EVENT_ALARM:
 		analog_set_alarm(p, 1);
 		analog_get_and_handle_alarms(p);
+		/* Intentionally fall through to analog_set_echocanceller() call */
 	case ANALOG_EVENT_ONHOOK:
 		switch (p->sig) {
 		case ANALOG_SIG_FXOLS:

Modified: branches/1.8/main/abstract_jb.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/main/abstract_jb.c?view=diff&rev=365460&r1=365459&r2=365460
==============================================================================
--- branches/1.8/main/abstract_jb.c (original)
+++ branches/1.8/main/abstract_jb.c Mon May  7 11:01:28 2012
@@ -406,6 +406,7 @@
 		case JB_IMPL_OK:
 			/* deliver the frame */
 			ast_write(chan, f);
+			/* Fall through intentionally */
 		case JB_IMPL_DROP:
 			jb_framelog("\tJB_GET {now=%ld}: %s frame with ts=%ld and len=%ld\n",
 				now, jb_get_actions[res], f->ts, f->len);

Modified: branches/1.8/main/audiohook.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/main/audiohook.c?view=diff&rev=365460&r1=365459&r2=365460
==============================================================================
--- branches/1.8/main/audiohook.c (original)
+++ branches/1.8/main/audiohook.c Mon May  7 11:01:28 2012
@@ -71,6 +71,7 @@
 	switch (type) {
 	case AST_AUDIOHOOK_TYPE_SPY:
 		ast_slinfactory_init(&audiohook->read_factory);
+		/* Fall through intentionally */
 	case AST_AUDIOHOOK_TYPE_WHISPER:
 		ast_slinfactory_init(&audiohook->write_factory);
 		break;
@@ -94,6 +95,7 @@
 	switch (audiohook->type) {
 	case AST_AUDIOHOOK_TYPE_SPY:
 		ast_slinfactory_destroy(&audiohook->read_factory);
+		/* Fall through intentionally */
 	case AST_AUDIOHOOK_TYPE_WHISPER:
 		ast_slinfactory_destroy(&audiohook->write_factory);
 		break;

Modified: branches/1.8/res/res_agi.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/res/res_agi.c?view=diff&rev=365460&r1=365459&r2=365460
==============================================================================
--- branches/1.8/res/res_agi.c (original)
+++ branches/1.8/res/res_agi.c Mon May  7 11:01:28 2012
@@ -3619,6 +3619,7 @@
 			"       When called with a topic as an argument, displays usage\n"
 			"       information on the given command.  If called without a\n"
 			"       topic, it provides a list of AGI commands.\n";
+		return NULL;
 	case CLI_GENERATE:
 		return NULL;
 	}

Modified: branches/1.8/res/res_speech.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/res/res_speech.c?view=diff&rev=365460&r1=365459&r2=365460
==============================================================================
--- branches/1.8/res/res_speech.c (original)
+++ branches/1.8/res/res_speech.c Mon May  7 11:01:28 2012
@@ -250,14 +250,12 @@
 {
 	int res = 0;
 
-	switch (state) {
-	case AST_SPEECH_STATE_WAIT:
+	if (state == AST_SPEECH_STATE_WAIT) {
 		/* The engine heard audio, so they spoke */
 		ast_set_flag(speech, AST_SPEECH_SPOKE);
-	default:
-		speech->state = state;
-		break;
-	}
+	}
+
+	speech->state = state;
 
 	return res;
 }