[asterisk-commits] mmichelson: trunk r367029 - in /trunk: ./ channels/chan_dahdi.c main/say.c

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Fri May 18 12:54:07 2012
New Revision: 367029

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=367029
Log:
Address MISSING_BREAK static analysis reports some more.

This addresses core findings 4 and 6.

Moises Silva helped me by stating that a break could be
safely added to the case where it is added in chan_dahdi.c

In say.c, I have added a comment indicating that static analysis
complains but that it is currently unknown if this is correct.

This fixes all core findings of this type.

(closes issue ASTERISK-19662)
reported by Matthew Jordan
........

Merged revisions 367027 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 367028 from http://svn.asterisk.org/svn/asterisk/branches/10

Modified:
    trunk/   (props changed)
    trunk/channels/chan_dahdi.c
    trunk/main/say.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-10-merged' - no diff available.

Modified: trunk/channels/chan_dahdi.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_dahdi.c?view=diff&rev=367029&r1=367028&r2=367029
==============================================================================
--- trunk/channels/chan_dahdi.c (original)
+++ trunk/channels/chan_dahdi.c Fri May 18 12:54:07 2012
@@ -8051,6 +8051,7 @@
 #else
 		ast_log(LOG_WARNING, "Received bits changed on %s signalling?\n", sig2str(p->sig));
 #endif
+		break;
 	case DAHDI_EVENT_PULSE_START:
 		/* Stop tone if there's a pulse start and the PBX isn't started */
 		if (!ast_channel_pbx(ast))

Modified: trunk/main/say.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/say.c?view=diff&rev=367029&r1=367028&r2=367029
==============================================================================
--- trunk/main/say.c (original)
+++ trunk/main/say.c Fri May 18 12:54:07 2012
@@ -6127,6 +6127,9 @@
 				if (tm.tm_hour < 10) {
 					res = wait_file(chan, ints, "digits/0", lang);
 				}
+				/* XXX Static analysis warns of no break here. No idea if this is
+				 * correct or not
+				 */
 			case 'k':
 				/* 24-Hour */
 				if (!(tm.tm_hour % 10) || tm.tm_hour < 10) {