From: Uwe Hermann <redacted>
Date: Wed, 10 Sep 2014 21:55:15 +0000 (+0200)
Subject: tests: Fix binary input test.
X-Git-Tag: libsigrok-0.4.0~1009
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=25f94dfebced0db7b0c0c403a1c90c517017fca5;p=libsigrok.git

tests: Fix binary input test.
---

diff --git a/tests/check_input_binary.c b/tests/check_input_binary.c
index 2ec39c8b..18567a0b 100644
--- a/tests/check_input_binary.c
+++ b/tests/check_input_binary.c
@@ -38,37 +38,37 @@ static int check_to_perform;
 static uint64_t expected_samples;
 static uint64_t *expected_samplerate;
 
-static void check_all_low(const struct sr_datafeed_logic *logic, uint64_t n)
+static void check_all_low(const struct sr_datafeed_logic *logic)
 {
 	uint64_t i;
 	uint8_t *data;
 
-	for (i = 0; i < n; i++) {
+	for (i = 0; i < logic->length; i++) {
 		data = logic->data;
 		if (data[i * logic->unitsize] != 0)
 			fail("Logic data was not all-0x00.");
 	}
 }
 
-static void check_all_high(const struct sr_datafeed_logic *logic, uint64_t n)
+static void check_all_high(const struct sr_datafeed_logic *logic)
 {
 	uint64_t i;
 	uint8_t *data;
 
-	for (i = 0; i < n; i++) {
+	for (i = 0; i < logic->length; i++) {
 		data = logic->data;
 		if (data[i * logic->unitsize] != 0xff)
 			fail("Logic data was not all-0xff.");
 	}
 }
 
-static void check_hello_world(const struct sr_datafeed_logic *logic, uint64_t n)
+static void check_hello_world(const struct sr_datafeed_logic *logic)
 {
 	uint64_t i;
 	uint8_t *data, b;
 	const char *h = "Hello world";
 
-	for (i = 0; i < n; i++) {
+	for (i = 0; i < logic->length; i++) {
 		data = logic->data;
 		b = data[sample_counter + i];
 		if (b != h[sample_counter + i])
@@ -153,11 +153,11 @@ static void datafeed_in(const struct sr_dev_inst *sdi,
 		// 	"unitsize %d).", logic->length, logic->unitsize);
 
 		if (check_to_perform == CHECK_ALL_LOW)
-			check_all_low(logic, expected_samples);
+			check_all_low(logic);
 		else if (check_to_perform == CHECK_ALL_HIGH)
-			check_all_high(logic, expected_samples);
+			check_all_high(logic);
 		else if (check_to_perform == CHECK_HELLO_WORLD)
-			check_hello_world(logic, expected_samples);
+			check_hello_world(logic);
 
 		sample_counter += logic->length / logic->unitsize;
 
@@ -246,7 +246,6 @@ START_TEST(test_input_binary_all_low)
 	for (i = 1; i < BUFSIZE; i *= 3) {
 		check_buf(NULL, buf, CHECK_ALL_LOW, i, NULL);
 		check_buf(options, buf, CHECK_ALL_LOW, i, &samplerate);
-
 	}
 
 	g_hash_table_destroy(options);