Merge "[nativewindow] fix -Wreorder-init-list" am: 81ecad0bf9 (75cb4bb6) · Commits · e / os / android_frameworks_native-old

libs/nativewindow/AHardwareBuffer.cpp

+4 −4

Original line number	Diff line number	Diff line
		@@ -266,10 +266,10 @@ int AHardwareBuffer_sendHandleToUnixSocket(const AHardwareBuffer* buffer, int so

		char buf[CMSG_SPACE(kFdBufferSize)];
		struct msghdr msg = {
		.msg_control = buf,
		.msg_controllen = sizeof(buf),
		.msg_iov = &iov[0],
		.msg_iovlen = 1,
		.msg_control = buf,
		.msg_controllen = sizeof(buf),
		};

		struct cmsghdr* cmsg = CMSG_FIRSTHDR(&msg);
		@@ -306,10 +306,10 @@ int AHardwareBuffer_recvHandleFromUnixSocket(int socketFd, AHardwareBuffer** out
		iov[0].iov_len = kMessageBufferSize;

		struct msghdr msg = {
		.msg_control = fdBuf,
		.msg_controllen = sizeof(fdBuf),
		.msg_iov = &iov[0],
		.msg_iovlen = 1,
		.msg_control = fdBuf,
		.msg_controllen = sizeof(fdBuf),
		};

		int result;