[svn-commits] rmudgett: branch 1.4 r1451 - /branches/1.4/q921.c

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Fri Jan 29 13:32:58 2010
New Revision: 1451

URL: http://svnview.digium.com/svn/libpri?view=rev&rev=1451
Log:
Only set eres if there actually is an event to pass up.

Modified:
    branches/1.4/q921.c

Modified: branches/1.4/q921.c
URL: http://svnview.digium.com/svn/libpri/branches/1.4/q921.c?view=diff&rev=1451&r1=1450&r2=1451
==============================================================================
--- branches/1.4/q921.c (original)
+++ branches/1.4/q921.c Fri Jan 29 13:32:58 2010
@@ -1629,12 +1629,7 @@
 
 			//res = q931_receive(PRI_MASTER(pri), pri->tei, (q931_h *)h->i.data, len - 4);
 			res = q931_receive(pri, pri->tei, (q931_h *)h->i.data, len - 4);
-
-			if (res == -1) {
-				eres = NULL;
-			}
-
-			if (res & Q931_RES_HAVEEVENT) {
+			if (res != -1 && (res & Q931_RES_HAVEEVENT)) {
 				eres = &pri->ev;
 			}