Version 0.1.12 from FTP

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

diff --git a/file.c b/file.c
index 6080f99669caa28debd64158710d2bf6f426d828..2fa223e692ab06b244894bc0238e61a4de9c3d21 100755 (executable)
--- a/file.c
+++ b/file.c
@@ -63,7 +63,7 @@ struct ast_filestream {
        struct ast_tranlator_pvt *tr;
 };
 
-static pthread_mutex_t formatlock = PTHREAD_MUTEX_INITIALIZER;
+static pthread_mutex_t formatlock = AST_MUTEX_INITIALIZER;
 
 static struct ast_format *formats = NULL;
 
@@ -503,7 +503,7 @@ char ast_waitstream(struct ast_channel *c, char *breakon)
                res = ast_sched_wait(c->sched);
                if (res < 0) {
                        ast_closestream(c->stream);
-                       return 0;
+                       break;
                }
                res = ast_waitfor(c, res);
                if (res < 0) {
@@ -522,9 +522,10 @@ char ast_waitstream(struct ast_channel *c, char *breakon)
                        switch(fr->frametype) {
                        case AST_FRAME_DTMF:
                                res = fr->subclass;
-                               ast_frfree(fr);
-                               if (strchr(breakon, res))
+                               if (strchr(breakon, res)) {
+                                       ast_frfree(fr);
                                        return res;
+                               }
                                break;
                        case AST_FRAME_CONTROL:
                                switch(fr->subclass) {
@@ -538,15 +539,14 @@ char ast_waitstream(struct ast_channel *c, char *breakon)
                                default:
                                        ast_log(LOG_WARNING, "Unexpected control subclass '%d'\n", fr->subclass);
                                }
-                       default:
-                               /* Ignore */
-                               ast_frfree(fr);
                        }
+                       /* Ignore */
+                       ast_frfree(fr);
                } else
                        ast_sched_runq(c->sched);
        
                
        }
-       return 0;
+       return (c->softhangup ? -1 : 0);
 }