More code optimizations. Thanks kpfleming!

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

diff --git a/apps/app_amd.c b/apps/app_amd.c
index f44c1af205745d44ffdb833eb416683e99900d50..8312958d22eb2be0b23ae711540ac21404aee3b0 100644 (file)
--- a/apps/app_amd.c
+++ b/apps/app_amd.c
@@ -207,19 +207,8 @@ static void isAnsweringMachine(struct ast_channel *chan, void *data)
 
        while ((ret = ast_waitfor(chan, totalAnalysisTime)))
        {
-               if (ret < 0) {
-                       /* No Frame: Called Party Must Have Dropped */
-                       if (option_verbose > 2)
-                               ast_verbose(VERBOSE_PREFIX_3 "AMD: HANGUP\n");
-                       if (option_debug)
-                               ast_log(LOG_DEBUG, "Got hangup\n");
-                       strcpy(amdStatus , "HANGUP" );
-                       strcpy(amdCause , "" );
-                       break;
-               }
-               f = ast_read(chan);
-               if (!f ) {
-                       /* No Frame: Called Party Must Have Dropped */
+               if (ret < 0 || !(f = ast_read(chan))) {
+                       /* No Frame OR Error on ast_waitfor : Called Party Must Have Dropped */
                        if (option_verbose > 2)
                                ast_verbose(VERBOSE_PREFIX_3 "AMD: HANGUP\n");
                        if (option_debug)