liburing/test: fix build errors

Commit Message

Joseph Qi Oct. 30, 2019, 7:16 a.m. UTC

Fix the following errors when make:
  error: ‘for’ loop initial declarations are only allowed in C99 mode
  error: redeclaration of ‘i’ with no linkage

Signed-off-by: Joseph Qi <[e-mail]>
---
 test/232c93d07b74-test.c | 7 +++++--
 test/defer.c             | 4 ++--
 2 files changed, 7 insertions(+), 4 deletions(-)

Comments

Jens Axboe Oct. 30, 2019, 2:11 p.m. UTC | #1

On 10/30/19 1:16 AM, Joseph Qi wrote:
> Fix the following errors when make:
>    error: ‘for’ loop initial declarations are only allowed in C99 mode
>    error: redeclaration of ‘i’ with no linkage

Applied, thanks.

Patch

diff --git a/test/232c93d07b74-test.c b/test/232c93d07b74-test.c
index b321668..c398de6 100644
--- a/test/232c93d07b74-test.c
+++ b/test/232c93d07b74-test.c
@@ -132,7 +132,9 @@  static void *rcv(void *arg)
 				if (cqe->res < 0)
 					assert(cqe->res == -EAGAIN);
 				else {
-					for (int i = 0; i < cqe->res; i++) {
+					int i;
+
+					for (i = 0; i < cqe->res; i++) {
 						if (buff[i] != expected_byte) {
 							fprintf(stderr,
 								"Received %d, wanted %d\n",
@@ -208,8 +210,9 @@  static void *snd(void *arg)
 
 	while (!done && bytes_written != 33) {
 		char buff[SEND_BUFF_SIZE];
+		int i;
 
-		for (int i = 0; i < SEND_BUFF_SIZE; i++)
+		for (i = 0; i < SEND_BUFF_SIZE; i++)
 			buff[i] = i + bytes_written;
 
 		struct iovec iov;
diff --git a/test/defer.c b/test/defer.c
index db0d904..f103a65 100644
--- a/test/defer.c
+++ b/test/defer.c
@@ -92,7 +92,7 @@  static int test_cancelled_userdata(struct io_uring *ring)
 	if (wait_cqes(&ctx))
 		goto err;
 
-	for (int i = 0; i < nr; i++) {
+	for (i = 0; i < nr; i++) {
 		if (i != ctx.cqes[i].user_data) {
 			printf("invalid user data\n");
 			goto err;
@@ -126,7 +126,7 @@  static int test_thread_link_cancel(struct io_uring *ring)
 	if (wait_cqes(&ctx))
 		goto err;
 
-	for (int i = 0; i < nr; i++) {
+	for (i = 0; i < nr; i++) {
 		bool fail = false;
 
 		if (i == 0)