Merge trunk revision 2572:

r2572 | sdake | 2009-12-07 11:22:48 -0700 (Mon, 07 Dec 2009) | 3 lines

Make assertions for range checking of message delivery check with the define
instead of magic numbers that are not valid if the define changes.



git-svn-id: http://svn.fedorahosted.org/svn/corosync/branches/flatiron@2627 fd59a12c-fef9-0310-b244-a6a79926bd2f

exec/totemsrp.c

@@ -2018,7 +2018,7 @@ static void memb_state_recovery_enter (
 		 */
 		goto no_originate;
 	}
-	assert (range < 1024);
+	assert (range < QUEUE_RTR_ITEMS_SIZE_MAX);
 
 	log_printf (instance->totemsrp_log_level_debug,
 		"copying all old ring messages from %x-%x.\n",
@@ -2245,7 +2245,7 @@ static void messages_free (
 	}
 
 	range = release_to - instance->last_released;
-	assert (range < 1024);
+	assert (range < QUEUE_RTR_ITEMS_SIZE_MAX);
 
 	/*
 	 * Release retransmit list items if group aru indicates they are transmitted
@@ -2476,7 +2476,7 @@ static int orf_token_rtr (
 	 */
 
 	range = instance->my_high_seq_received - instance->my_aru;
-	assert (range < 100000);
+	assert (range < QUEUE_RTR_ITEMS_SIZE_MAX);
 
 	for (i = 1; (orf_token->rtr_list_entries < RETRANSMIT_ENTRIES_MAX) &&
 		(i <= range); i++) {
@@ -3630,7 +3630,7 @@ static void messages_deliver_to_app (
 			"Delivering %x to %x\n", instance->my_high_delivered,
 			end_point);
 	}
-	assert (range < 10240);
+	assert (range < QUEUE_RTR_ITEMS_SIZE_MAX);
 	my_high_delivered_stored = instance->my_high_delivered;
 
 	/*