[asterisk-commits] irroot: branch irroot/asterisk-trunk-quack-queue r344953 - /team/irroot/aster...

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Sat Nov 12 03:36:42 CST 2011


Author: irroot
Date: Sat Nov 12 03:36:37 2011
New Revision: 344953

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=344953
Log:
Whitespace fix

Modified:
    team/irroot/asterisk-trunk-quack-queue/apps/app_queue.c

Modified: team/irroot/asterisk-trunk-quack-queue/apps/app_queue.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/asterisk-trunk-quack-queue/apps/app_queue.c?view=diff&rev=344953&r1=344952&r2=344953
==============================================================================
--- team/irroot/asterisk-trunk-quack-queue/apps/app_queue.c (original)
+++ team/irroot/asterisk-trunk-quack-queue/apps/app_queue.c Sat Nov 12 03:36:37 2011
@@ -3395,12 +3395,12 @@
 /*! 
  * \brief Part 2 of ring_one
  *
- * Does error checking before attempting to request a channel and call a member. 
- * This function is only called from ring_one(). 
+ * Does error checking before attempting to request a channel and call a member.
+ * This function is only called from ring_one().
  * Failure can occur if:
  * - Priority by another queue
  * - Wrapup time not expired
- * - Member is paused 
+ * - Member is paused
  * - Member on call / or is not available for a call
  * - Channel cannot be created by driver
  * - Channel cannot be called by driver
@@ -3457,9 +3457,9 @@
 
 	/* do not ring a member that is not able to take a call */
 	dstat = get_device_status(tmp->member);
-	if ((dstat == AST_DEVICE_INVALID) || 
-	    (dstat == AST_DEVICE_BUSY) || 
-	    (dstat == AST_DEVICE_UNAVAILABLE) || 
+	if ((dstat == AST_DEVICE_INVALID) ||
+	    (dstat == AST_DEVICE_BUSY) ||
+	    (dstat == AST_DEVICE_UNAVAILABLE) ||
 	    (!qe->parent->ringinuse && (dstat != AST_DEVICE_NOT_INUSE) && (dstat != AST_DEVICE_UNKNOWN))) {
 		ao2_unlock(tmp->member);
 		ast_debug(1, "%s is %s, can't receive call\n", tmp->member->interface, ast_devstate2str(dstat));
@@ -5746,8 +5746,10 @@
 	}
 	ao2_iterator_destroy(&mem_iter);
 
-	if (value_len && (ast_db_put(pm_family, pm_queue->name, value))) {
-		ast_log(LOG_WARNING, "failed to create persistent dynamic entry!\n");
+	if (value_len) {
+		if (ast_db_put(pm_family, pm_queue->name, value)) {
+			ast_log(LOG_WARNING, "failed to create persistent dynamic entry!\n");
+		}
 	} else {
 		/* Delete the entry if the queue is empty or there is an error */
 		ast_db_del(pm_family, pm_queue->name);




More information about the asterisk-commits mailing list