Merge branch 'selftests-net-Fix-clang-warnings-on-powerpc' (11d26810) · Commits · 戴 / test

tools/testing/selftests/net/psock_fanout.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -350,7 +350,8 @@ static int test_datapath(uint16_t typeflags, int port_off,
		int fds[2], fds_udp[2][2], ret;

		fprintf(stderr, "\ntest: datapath 0x%hx ports %hu,%hu\n",
		typeflags, PORT_BASE, PORT_BASE + port_off);
		typeflags, (uint16_t)PORT_BASE,
		(uint16_t)(PORT_BASE + port_off));

		fds[0] = sock_fanout_open(typeflags, 0);
		fds[1] = sock_fanout_open(typeflags, 0);

+1 −2

Original line number	Diff line number	Diff line
		@@ -329,8 +329,7 @@ int main(int argc, char **argv)
		bool all_tests = true;
		int arg_index = 0;
		int failures = 0;
		int s, t;
		char opt;
		int s, t, opt;

		while ((opt = getopt_long(argc, argv, "", long_options,
		&arg_index)) != -1) {

+1 −1

Original line number	Diff line number	Diff line
		@@ -121,7 +121,7 @@ static bool do_recv_one(int fdr, struct timed_send *ts)
		if (rbuf[0] != ts->data)
		error(1, 0, "payload mismatch. expected %c", ts->data);

		if (labs(tstop - texpect) > cfg_variance_us)
		if (llabs(tstop - texpect) > cfg_variance_us)
		error(1, 0, "exceeds variance (%d us)", cfg_variance_us);

		return false;

+3 −3

Original line number	Diff line number	Diff line
		@@ -344,7 +344,7 @@ int main(int argc, char *argv[])
		{
		struct sockaddr_storage listenaddr, addr;
		unsigned int max_pacing_rate = 0;
		size_t total = 0;
		uint64_t total = 0;
		char *host = NULL;
		int fd, c, on = 1;
		char *buffer;
		@@ -473,12 +473,12 @@ int main(int argc, char *argv[])
		zflg = 0;
		}
		while (total < FILE_SZ) {
		ssize_t wr = FILE_SZ - total;
		int64_t wr = FILE_SZ - total;

		if (wr > chunk_size)
		wr = chunk_size;
		/* Note : we just want to fill the pipe with 0 bytes */
		wr = send(fd, buffer, wr, zflg ? MSG_ZEROCOPY : 0);
		wr = send(fd, buffer, (size_t)wr, zflg ? MSG_ZEROCOPY : 0);
		if (wr <= 0)
		break;
		total += wr;