[asterisk-commits] pcadach: trunk r53884 - in /trunk: ./ apps/app_echo.c

[asterisk-commits at lists.digium.com]

Author: pcadach
Date: Sat Feb 10 03:22:15 2007
New Revision: 53884

URL: http://svn.digium.com/view/asterisk?view=rev&rev=53884
Log:
Merged revisions 53880 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r53880 | pcadach | 2007-02-10 01:08:55 -0800 (Сбт, 10 Фев 2007) | 1 line

Much simpler than previous one ;-)
........

Modified:
    trunk/   (props changed)
    trunk/apps/app_echo.c

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

Modified: trunk/apps/app_echo.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_echo.c?view=diff&rev=53884&r1=53883&r2=53884
==============================================================================
--- trunk/apps/app_echo.c (original)
+++ trunk/apps/app_echo.c Sat Feb 10 03:22:15 2007
@@ -69,21 +69,14 @@
 			break;
 		f->delivery.tv_sec = 0;
 		f->delivery.tv_usec = 0;
-		switch (f->frametype) {
-		case AST_FRAME_DTMF:
-			if (f->subclass == '#') {
-				res = 0;
-				if (ast_write(chan, f))
-					res = -1;
-				ast_frfree(f);
-				goto end;
-			}
-			/* fall through */
-		default:
-			if (ast_write(chan, f)) {
-				ast_frfree(f);
-				goto end;
-			}
+		if (ast_write(chan, f)) {
+			ast_frfree(f);
+			goto end;
+		}
+		if ((f->frametype == AST_FRAME_DTMF) && (f->subclass == '#')) {
+			res = 0;
+			ast_frfree(f);
+			goto end;
 		}
 		ast_frfree(f);
 	}