remove some duplicated code (issue #6098)

Also, touch up some formatting

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

diff --git a/channel.c b/channel.c
index 268587e17625f22d29e7fd7eb1666d0bfa16445b..a482cf1d548223c17074c7b70bed9f9b9efff5f7 100644 (file)
--- a/channel.c
+++ b/channel.c
@@ -808,16 +808,15 @@ struct ast_channel *ast_get_channel_by_exten_locked(const char *exten, const cha
 }
 
 /*! \brief Wait, look for hangups and condition arg */
-int ast_safe_sleep_conditional(        struct ast_channel *chan, int ms,
-       int (*cond)(void*), void *data )
+int ast_safe_sleep_conditional(struct ast_channel *chan, int ms, int (*cond)(void*), void *data)
 {
        struct ast_frame *f;
 
-       while(ms > 0) {
-               if( cond && ((*cond)(data) == 0 ) )
+       while (ms > 0) {
+               if (cond && ((*cond)(data) == 0))
                        return 0;
                ms = ast_waitfor(chan, ms);
-               if (ms <0)
+               if (ms < 0)
                        return -1;
                if (ms > 0) {
                        f = ast_read(chan);
@@ -832,19 +831,7 @@ int ast_safe_sleep_conditional(    struct ast_channel *chan, int ms,
 /*! \brief Wait, look for hangups */
 int ast_safe_sleep(struct ast_channel *chan, int ms)
 {
-       struct ast_frame *f;
-       while(ms > 0) {
-               ms = ast_waitfor(chan, ms);
-               if (ms <0)
-                       return -1;
-               if (ms > 0) {
-                       f = ast_read(chan);
-                       if (!f)
-                               return -1;
-                       ast_frfree(f);
-               }
-       }
-       return 0;
+       return ast_safe_sleep_conditional(chan, ms, NULL, NULL);
 }
 
 static void free_cid(struct ast_callerid *cid)