[svn-commits] rmudgett: branch group/new-API r301 - /team/group/new-API/

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Fri Jul 13 17:19:38 2012
New Revision: 301

URL: http://svnview.digium.com/svn/libss7?view=rev&rev=301
Log:
  r294 | rmudgett | 2011-09-16 15:17:46 -0500 (Fri, 16 Sep 2011) | 1 line

  Remove some redundant error messages.

Modified:
    team/group/new-API/isup_masq.c
    team/group/new-API/mtp2.c
    team/group/new-API/mtp3.c

Modified: team/group/new-API/isup_masq.c
URL: http://svnview.digium.com/svn/libss7/team/group/new-API/isup_masq.c?view=diff&rev=301&r1=300&r2=301
==============================================================================
--- team/group/new-API/isup_masq.c (original)
+++ team/group/new-API/isup_masq.c Fri Jul 13 17:19:38 2012
@@ -32,11 +32,10 @@
 static void isup_set_event(struct ss7 *ss7, int event)
 {
 	/* A little worker function to put events into the event q */
-	
 	ss7_event *e = ss7_next_empty_event(ss7);
-	e->e = event;
-	
-	return;
+	if (e) {
+		e->e = event;
+	}
 }	
 
 static int isup_ip_dump(struct mtp2 *link, char prefix, unsigned char * msg, int len)
@@ -97,7 +96,6 @@
 	ss7_event *e = ss7_next_empty_event(mtp2->master);
 
 	if (!e) {
-		ss7_message(mtp2->master, "Could not allocate new event in isup_ip_link_down\n");
 		return;
 	}
 

Modified: team/group/new-API/mtp2.c
URL: http://svnview.digium.com/svn/libss7/team/group/new-API/mtp2.c?view=diff&rev=301&r1=300&r2=301
==============================================================================
--- team/group/new-API/mtp2.c (original)
+++ team/group/new-API/mtp2.c Fri Jul 13 17:19:38 2012
@@ -616,7 +616,6 @@
 					ss7_schedule_del(link->master, &link->t1);
 					e = ss7_next_empty_event(link->master);
 					if (!e) {
-						mtp_error(link->master, "Could not queue event\n");
 						return -1;
 					}
 					e->gen.e = MTP2_LINK_UP;
@@ -632,7 +631,6 @@
 			if (newstate != MTP_INSERVICE) {
 				e = ss7_next_empty_event(link->master);
 				if (!e) {
-					mtp_error(link->master, "Could not queue event\n");
 					return -1;
 				}
 				e->gen.e = MTP2_LINK_DOWN;

Modified: team/group/new-API/mtp3.c
URL: http://svnview.digium.com/svn/libss7/team/group/new-API/mtp3.c?view=diff&rev=301&r1=300&r2=301
==============================================================================
--- team/group/new-API/mtp3.c (original)
+++ team/group/new-API/mtp3.c Fri Jul 13 17:19:38 2012
@@ -382,7 +382,6 @@
 {
 	ss7_event *e = ss7_next_empty_event(ss7);
 	if (!e) {
-		mtp_error(ss7, "Event queue full\n");
 		return;
 	}
 	e->e = SS7_STATE_UP;
@@ -484,10 +483,10 @@
 	if (ss7->state != SS7_STATE_DOWN && !mtp3_up) {
 			ss7->state = SS7_STATE_DOWN;
 			if (ss7->linkset_up_timer == -1) {
-				ss7_event *e = ss7_next_empty_event(ss7);
+				ss7_event *e;
 				
+				e = ss7_next_empty_event(ss7);
 				if (!e) {
-					ss7_error(ss7, "Event queue full!");
 					return -1;
 				}
 				e->e = SS7_EVENT_DOWN;