[libpri-commits] rmudgett: branch rmudgett/ect r1651 - /team/rmudgett/ect/

[SVN commits to the libpri project]

Author: rmudgett
Date: Thu Apr 22 11:15:14 2010
New Revision: 1651

URL: http://svnview.digium.com/svn/libpri?view=rev&rev=1651
Log:
Address reviewboard comments.

Modified:
    team/rmudgett/ect/pri.c
    team/rmudgett/ect/pri_facility.c

Modified: team/rmudgett/ect/pri.c
URL: http://svnview.digium.com/svn/libpri/team/rmudgett/ect/pri.c?view=diff&rev=1651&r1=1650&r2=1651
==============================================================================
--- team/rmudgett/ect/pri.c (original)
+++ team/rmudgett/ect/pri.c Thu Apr 22 11:15:14 2010
@@ -1036,8 +1036,9 @@
 	call2 = winner;
 
 	/* Check to see if we're on the same PRI */
-	if (call1->pri != call2->pri)
-		return -1;
+	if (call1->pri != call2->pri) {
+		return -1;
+	}
 
 	/* Check for bearer capability */
 	if (call1->bc.transcapability != call2->bc.transcapability)

Modified: team/rmudgett/ect/pri_facility.c
URL: http://svnview.digium.com/svn/libpri/team/rmudgett/ect/pri_facility.c?view=diff&rev=1651&r1=1650&r2=1651
==============================================================================
--- team/rmudgett/ect/pri_facility.c (original)
+++ team/rmudgett/ect/pri_facility.c Thu Apr 22 11:15:14 2010
@@ -2429,10 +2429,8 @@
 
 		/* Remember that if we queue a facility IE for a facility message we
 		 * have to explicitly send the facility message ourselves */
-		if (pri_call_apdu_queue(call_2, Q931_FACILITY, buffer, end - buffer, NULL)) {
-			break;
-		}
-		if (q931_facility(call->pri, call_2)) {
+		if (pri_call_apdu_queue(call_2, Q931_FACILITY, buffer, end - buffer, NULL)
+			|| q931_facility(call_2->pri, call_2)) {
 			pri_message(ctrl, "Could not schedule facility message for call %d\n",
 				call_2->cr);
 		}
@@ -2440,7 +2438,7 @@
 	default:
 		break;
 	}
-	return 0;
+	return 1;
 }
 
 /*!
@@ -2504,7 +2502,8 @@
 	 * have to explicitly send the facility message ourselves */
 	if (pri_call_apdu_queue(call_1, Q931_FACILITY, buffer, end - buffer, &response)
 		|| q931_facility(call_1->pri, call_1)) {
-		pri_message(ctrl, "Could not schedule facility message for call %d\n", call_1->cr);
+		pri_message(ctrl, "Could not schedule facility message for call %d\n",
+			call_1->cr);
 		return -1;
 	}