Unverified Commit fb3b0f25 authored Jul 16, 2017 by Marcel Raad

libtest: fix MSVC warning C4706

With warning level 4, MSVC warns about assignments within conditional
expressions. Change the while loop to a do-while loop to fix this. This
change is also consistent with CODE_STYLE.md.

parent 0bdb8112

tests/libtest/lib1515.c

+4 −3

Original line number	Original line	Diff line number	Diff line
	@@ -95,12 +95,13 @@ static int do_one_request(CURLM m, char URL, char *resolve)
	abort_on_test_timeout();		abort_on_test_timeout();
	}		}

	while((msg = curl_multi_info_read(m, &msgs_left))) {		do {
	if(msg->msg == CURLMSG_DONE && msg->easy_handle == curls) {		msg = curl_multi_info_read(m, &msgs_left);
			if(msg && msg->msg == CURLMSG_DONE && msg->easy_handle == curls) {
	res = msg->data.result;		res = msg->data.result;
	break;		break;
	}		}
	}		} while(msg);

	test_cleanup:		test_cleanup:

tests/libtest/lib1531.c

+4 −3

Original line number	Original line	Diff line number	Diff line
	@@ -127,12 +127,13 @@ int test(char *URL)
	} while(still_running);		} while(still_running);

	/* See how the transfers went */		/* See how the transfers went */
	while((msg = curl_multi_info_read(multi_handle, &msgs_left))) {		do {
	if(msg->msg == CURLMSG_DONE) {		msg = curl_multi_info_read(multi_handle, &msgs_left);
			if(msg && msg->msg == CURLMSG_DONE) {
	printf("HTTP transfer completed with status %d\n", msg->data.result);		printf("HTTP transfer completed with status %d\n", msg->data.result);
	break;		break;
	}		}
	}		} while(msg);

	curl_multi_cleanup(multi_handle);		curl_multi_cleanup(multi_handle);

tests/libtest/lib1900.c

+4 −3

Original line number	Original line	Diff line number	Diff line
	@@ -189,8 +189,9 @@ int test(char *URL)
	abort_on_test_timeout();		abort_on_test_timeout();

	/* See how the transfers went */		/* See how the transfers went */
	while((msg = curl_multi_info_read(m, &msgs_left))) {		do {
	if(msg->msg == CURLMSG_DONE) {		msg = curl_multi_info_read(m, &msgs_left);
			if(msg && msg->msg == CURLMSG_DONE) {
	int i, found = 0;		int i, found = 0;

	/* Find out which handle this message is about */		/* Find out which handle this message is about */
	@@ -203,7 +204,7 @@ int test(char *URL)
	printf("Handle %d Completed with status %d\n", i, msg->data.result);		printf("Handle %d Completed with status %d\n", i, msg->data.result);
	curl_multi_remove_handle(m, handles[i]);		curl_multi_remove_handle(m, handles[i]);
	}		}
	}		} while(msg);

	if(handlenum == num_handles && !running) {		if(handlenum == num_handles && !running) {
	break; /* done */		break; /* done */