Minor code cleanup.
authorJoshua Colp <jcolp@digium.com>
Tue, 12 Jun 2007 13:58:13 +0000 (13:58 +0000)
committerJoshua Colp <jcolp@digium.com>
Tue, 12 Jun 2007 13:58:13 +0000 (13:58 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@68901 65c4cc65-6c06-0410-ace0-fbb531ad65f3

main/channel.c

index 53fe35f..2ba4d3d 100644 (file)
@@ -395,21 +395,20 @@ int ast_channel_cmpwhentohangup(struct ast_channel *chan, time_t offset)
 {
        time_t whentohangup;
 
-       if (chan->whentohangup == 0) {
+       if (!chan->whentohangup)
                return (offset == 0) ? 0 : -1;
-       } else {
-               if (offset == 0)        /* XXX why is this special ? */
-                       return (1);
-               else {
-                       whentohangup = offset + time (NULL);
-                       if (chan->whentohangup < whentohangup)
-                               return (1);
-                       else if (chan->whentohangup == whentohangup)
-                               return (0);
-                       else
-                               return (-1);
-               }
-       }
+
+       if (!offset) /* XXX why is this special? */
+               return 1;
+
+       whentohangup = offset + time(NULL);
+
+       if (chan->whentohangup < whentohangup)
+               return 1;
+       else if (chan->whentohangup == whentohangup)
+               return 0;
+       else
+               return -1;
 }
 
 /*! \brief Register a new telephony channel in Asterisk */