Fix bugs coming from refactoring

This commit is contained in:
Thomas Preud'homme 2011-05-05 19:54:44 +02:00
parent 372c36155a
commit f430cc17a7
1 changed files with 26 additions and 20 deletions

View File

@ -398,20 +398,23 @@ int consumer(void *cons_channel)
total_data_received += nb_data_received;
for (i = 0; i < nb_data_received; i++)
{
if (inc_check_next(cons_check_context, &cons_check_value))
if (check_recv_match_send)
{
if (!delayed_error)
if (inc_check_next(cons_check_context, &cons_check_value))
{
fprintf(stderr, "Error while checking received value match sent value\n");
delayed_error = 1;
if (!delayed_error)
{
fprintf(stderr, "Error while checking received value match sent value\n");
delayed_error = 1;
}
}
}
if (cons_check_value != (uintptr_t) data_buf[i])
{
if (!delayed_error)
if (cons_check_value != (uintptr_t) data_buf[i])
{
fprintf(stderr, "Mismatch between expected(%lu) and received values(%lu)\n", cons_check_value, (uintptr_t) data_buf[i]);
delayed_error = 1;
if (!delayed_error)
{
fprintf(stderr, "Mismatch between expected(%lu) and received values(%lu)\n", cons_check_value, (uintptr_t) data_buf[i]);
delayed_error = 1;
}
}
}
on_message(data_buf[i]);
@ -429,20 +432,23 @@ int consumer(void *cons_channel)
void *data;
data = recv_one_data(cons_channel);
if (inc_check_next(cons_check_context, &cons_check_value))
if (check_recv_match_send)
{
if (!delayed_error)
if (inc_check_next(cons_check_context, &cons_check_value))
{
fprintf(stderr, "Error while checking received value match sent value\n");
delayed_error = 1;
if (!delayed_error)
{
fprintf(stderr, "Error while checking received value match sent value\n");
delayed_error = 1;
}
}
}
if (cons_check_value != (uintptr_t) data)
{
if (!delayed_error)
if (cons_check_value != (uintptr_t) data)
{
fprintf(stderr, "Mismatch between expected(%lu) and received values(%lu)\n", cons_check_value, (uintptr_t) data);
delayed_error = 1;
if (!delayed_error)
{
fprintf(stderr, "Mismatch between expected(%lu) and received values(%lu)\n", cons_check_value, (uintptr_t) data);
delayed_error = 1;
}
}
}
on_message(data);