From nobody Wed Sep 27 12:53:17 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rwc3d5BqNz4vQjL; Wed, 27 Sep 2023 12:53:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rwc3d25tgz4VYH; Wed, 27 Sep 2023 12:53:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695819197; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3BJMVfq96B4rLR/081srqO2OolfR4R10AQXAzwoIcEE=; b=aAlEzCsnQgeHw8YDF4INtqyL61dF0UG3ym+seh1hvefMCbV1g2z/9yhQ3ITfuyIX3ZV+px GUXZOhQYVL3h3UMlBt4IwiFBMXZPobgt8Vf/sTuSxIp2L1rVvq/ukJqq/J7kRweqlmLhNO eV7u7bI2iInERKsI48WZurTeiF65dXB5CSXrtFIFINoGrQppIKpZQiedLSBZvWp5b/8whk P9QyfOTb0CMNNvXE2Ip9UCKMzsJLUocKJJ/ExmG7F5Sz54x/5WhlzkN9XbMWP6GXLzdf9+ ATQTh2pDQzoolqQFEp9cq6sw0odjsHV8le8X/8oR9OpKD2/A6VJox6OGNHFKig== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695819197; a=rsa-sha256; cv=none; b=YoNIoXJbxtm3WX8VCra7VdRHyIYQX9Mc09QquZI4Vf7fwbGkU/bSY/hXD1M/kKgJhqlKln WA4cPF3++Z7/3NbD6zjm6pOCU9mFZy1PcRMV+3rT+xAR92pwn8GmmzJ2o34ZxIVmtkxXgL Poke3Kjoq0QZzqmBr4oCzP2jSBteo3z9VCvjOSS9g/laASPiwRnQDeeqsskAfeY3WQmlQB eKDgc2yFYp9ou+06y+Qr/dJoBqVq8ujQ3LO1z9unf65Sx0FSRB7KJJaYzFMMqBXOvyMcPZ F59ReIPmypQCIqYkwxjzGn6/voobR1XrzLp7HlTq57dE1he5lWbc9f78BVqkQA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695819197; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3BJMVfq96B4rLR/081srqO2OolfR4R10AQXAzwoIcEE=; b=ce1fkK48y/KGfCHI00pQfDCCLS3dc8nPeZSR8AcfC2NNNfHn2ePb0VKADE/SFrhmSX+C16 7A/hGHSqrQsz7uNBL32mYURwUNn9DqDnunxT6s22I0jnYn160vCe21rIoevZuQYkVKsxCw DEqlXM4+ZqSORKwj8u2EaFMvG7M01RjnALEKwMzu9k4T9AESy4C0heFQgRhAX//QxIReU8 MR5I7F1aN/G6pybf76Pw+RZcBupWPgq8TjEoi4/Y/Ak7XnbOIo11taUqIgPEurGPsMV06C K2/ZDvw76zmI5F2uYQJ1ysndZ3k7fbWq7udGzZ7YfvBs+YmejE2yialaOJehdw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rwc3d16YJzgQr; Wed, 27 Sep 2023 12:53:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38RCrHKU024495; Wed, 27 Sep 2023 12:53:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38RCrHtZ024492; Wed, 27 Sep 2023 12:53:17 GMT (envelope-from git) Date: Wed, 27 Sep 2023 12:53:17 GMT Message-Id: <202309271253.38RCrHtZ024492@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 66b87decbf1e - stable/14 - unix tests: Use the right type for sendmsg(2) return values List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 66b87decbf1e200547983ab7066de453428f456b Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=66b87decbf1e200547983ab7066de453428f456b commit 66b87decbf1e200547983ab7066de453428f456b Author: Mark Johnston AuthorDate: 2023-09-15 08:59:08 +0000 Commit: Mark Johnston CommitDate: 2023-09-27 12:32:49 +0000 unix tests: Use the right type for sendmsg(2) return values MFC after: 1 week (cherry picked from commit d643925a79caab5c6de62b066e374935b60bcaf1) --- tests/sys/kern/unix_passfd_test.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/sys/kern/unix_passfd_test.c b/tests/sys/kern/unix_passfd_test.c index 94f0c420029a..d8c0efe5b9ea 100644 --- a/tests/sys/kern/unix_passfd_test.c +++ b/tests/sys/kern/unix_passfd_test.c @@ -182,13 +182,13 @@ sendfd_payload(int sockfd, int send_fd, void *payload, size_t paylen) static void sendfd(int sockfd, int send_fd) { - size_t len; + ssize_t len; char ch; ch = 0; len = sendfd_payload(sockfd, send_fd, &ch, sizeof(ch)); ATF_REQUIRE_MSG(len == sizeof(ch), - "sendmsg: %zu bytes sent; expected %zu; %s", len, sizeof(ch), + "sendmsg: %zd bytes sent; expected %zu; %s", len, sizeof(ch), strerror(errno)); } @@ -532,10 +532,10 @@ ATF_TC_BODY(send_overflow, tc) len = sendfd_payload(fd[0], putfd, buf, sendspace); #if TEST_PROTO == SOCK_STREAM ATF_REQUIRE_MSG(len == -1 && errno == EAGAIN, - "sendmsg: %zu bytes sent, errno %d", len, errno); + "sendmsg: %zd bytes sent, errno %d", len, errno); #elif TEST_PROTO == SOCK_DGRAM ATF_REQUIRE_MSG(len == -1 && errno == ENOBUFS, - "sendmsg: %zu bytes sent, errno %d", len, errno); + "sendmsg: %zd bytes sent, errno %d", len, errno); #endif close(putfd); ATF_REQUIRE(nfiles == openfiles()); @@ -655,14 +655,14 @@ ATF_TC_BODY(rights_creds_payload, tc) #if TEST_PROTO == SOCK_STREAM ATF_REQUIRE_MSG(len != -1 , "sendmsg failed: %s", strerror(errno)); ATF_REQUIRE_MSG((size_t)len < sendspace, - "sendmsg: %zu bytes sent", len); + "sendmsg: %zd bytes sent", len); recvfd_payload(fd[1], &getfd, buf, len, CMSG_SPACE(SOCKCREDSIZE(CMGROUP_MAX)) + CMSG_SPACE(sizeof(int)), 0); #endif #if TEST_PROTO == SOCK_DGRAM ATF_REQUIRE_MSG(len != -1 , "sendmsg failed: %s", strerror(errno)); ATF_REQUIRE_MSG((size_t)len == sendspace, - "sendmsg: %zu bytes sent", len); + "sendmsg: %zd bytes sent", len); recvfd_payload(fd[1], &getfd, buf, len, CMSG_SPACE(SOCKCREDSIZE(CMGROUP_MAX)) + CMSG_SPACE(sizeof(int)), 0); #endif