[Spread-cvs] commit: r674 - trunk/daemon

[jschultz at spread.org]

Author: jschultz
Date: 2014-01-22 02:53:22 -0500 (Wed, 22 Jan 2014)
New Revision: 674

Modified:
   trunk/daemon/membership.c
Log:
Fix debug print bugs


Modified: trunk/daemon/membership.c
===================================================================
--- trunk/daemon/membership.c	2014-01-22 07:12:08 UTC (rev 673)
+++ trunk/daemon/membership.c	2014-01-22 07:53:22 UTC (rev 674)
@@ -1981,8 +1981,7 @@
 		form_token->type = FORM2_TYPE;
 		/* this is the only difference between form1 and form2 tokens */
 		send_scat.elements[2].len = sizeof(membership_id);
-		form_token->rtr_len = send_scat.elements[1].len + 
-				send_scat.elements[2].len + send_scat.elements[3].len;
+		form_token->rtr_len = send_scat.elements[1].len + send_scat.elements[2].len + send_scat.elements[3].len;
 		Net_ucast_token( m_info->members[0], &send_scat );
 		Net_ucast_token( m_info->members[0], &send_scat );
 		/*Net_ucast_token( m_info->members[0], &send_scat );*/
@@ -1990,7 +1989,7 @@
 
 	if ( Alarm_get_priority() >= SPLOG_INFO && ( Alarm_get_types() & MEMB ) != 0 ) {
 		Alarmp( SPLOG_INFO, MEMB, "Fill_form1: SENT following token:\n" );
-	        Memb_print_form_token( scat );
+	        Memb_print_form_token( send_scat );
 	}
 
 	E_dequeue( Send_join_event, 0, NULL );
@@ -2207,8 +2206,8 @@
 		Token_rounds = 0;
 
 		if ( Alarm_get_priority() >= SPLOG_INFO && ( Alarm_get_types() & MEMB ) != 0 ) {
-		  Alarmp( SPLOG_INFO, MEMB, "Read_form2: RECEIVED following token:\n" );
-		  Memb_print_form_token( scat );
+		  Alarmp( SPLOG_INFO, MEMB, "Read_form2: SENT following token:\n" );
+		  Memb_print_form_token( send_scat );
 		}
 
 	}else{