From nobody Tue Mar 29 01:51:06 2022 X-Original-To: dev-commits-src-all@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 1DBBE1A40263; Tue, 29 Mar 2022 01:51:07 +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 4KSCG25Z7Sz3M97; Tue, 29 Mar 2022 01:51:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648518666; 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=vujgdqdNkyR8NDavSNM/zTLbPkFTEJ+dzwNG9V2rV3s=; b=LI8MDu1sOY9VGZfFf4CPqI3eIFPALsLAN0mivY4X7pUPRJbpzP1rJcjMEXvetg8UfskG8V ZkP7uTyCa44DMniY+nkzBF3XhkUYwvx26Q9coptQVuavXNH34m666lzmhkrVNGI5IhtytS QPEyQ7p3zhA4gEPiKDKMRdNRivmPWvh/s106TPg5jiUeTQmWb98gpWPihuQaJVTc/SyOR+ wrOZ7w7hVFU7wGy1Gb4OT/s0n+5/GsQ117NJu+pHySQb+KlaWBCQeb0xhQC7DaLo75zzJ6 AXlMLaP5epjjIAnKz5cLfaDIabeFPD4H4FNCPQ6NIkQ0K4CNM7DKVdNiKjZSag== 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 519BD155F5; Tue, 29 Mar 2022 01:51:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22T1p6no033401; Tue, 29 Mar 2022 01:51:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22T1p6R5033375; Tue, 29 Mar 2022 01:51:06 GMT (envelope-from git) Date: Tue, 29 Mar 2022 01:51:06 GMT Message-Id: <202203290151.22T1p6R5033375@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Motin Subject: git: a7318b86e4ff - stable/13 - CTL: Rework 05c3e8e87142 using %zu format. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mav X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a7318b86e4ffdc3567ad5909c654cbdf9922c18d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648518666; 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=vujgdqdNkyR8NDavSNM/zTLbPkFTEJ+dzwNG9V2rV3s=; b=tmGlNV2obq5yBRf5uEuAsTmvNAzIgfLysf5famYoFWdZXi7T8oWn8ryCaaYAmbxCRMEm9t j8TdCa4aCEcZ7KxHdhqf00FJ1uRcvW4MkFzsSBM5zot0XRPvWwPCPByhyVEmD2IDsQf973 JdaBm4G6Qdr3Usfwss6inD9PeLjSONavO9GhildPOo+o73wFGFTtTnU9/SmtQ7tE4+qDGz RKcDbFX3fnf07vOehRtr+L+gfUxsyt4b6hmxCSbx0VRU+iVFrYQqM9bWeENkv+rFCBwHKe wDCGhTpnHJJXJ5w2KTdVplWuyLIF7BcHa87w1HacyABAW+fOljx+D02+ubXx8Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648518666; a=rsa-sha256; cv=none; b=YnjPIfJAQm0CBxPQ4e0ACWVb0i5ItvwxWcwKKt9QHWhvi4OtALTMec4rCbFqF970i25uVT +q+TK/J910Zuj0Di/CdMmNtGwhdepjiYi982ptxOVnJQt2Xp2KoqxhP1TzkLV9/Pa09Uc9 di+aQ+ch+W32KejzrAMzSlS6EYYvQLHMU6t8lCnw66yK3sT0pL0lmNigEVIKJ/RELksIyA Z/tnEnWVbNvFz1JysRgwEZQIBWra7OwdhBNTBUKTIsoImK+k6Yg+9ny5kWnimmjE3U2ZYo KJgPPNs8rI00ovvbVScN/02y5jFAFCJaa6+fYMzk3rD7a00qWjBuEaWBKE/WmQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=a7318b86e4ffdc3567ad5909c654cbdf9922c18d commit a7318b86e4ffdc3567ad5909c654cbdf9922c18d Author: Alexander Motin AuthorDate: 2022-02-25 16:52:17 +0000 Commit: Alexander Motin CommitDate: 2022-03-29 01:30:48 +0000 CTL: Rework 05c3e8e87142 using %zu format. MFC after: 2 days (cherry picked from commit f00ced06da25540c2057e46033d1c38b4ade7c8b) --- sys/cam/ctl/ctl.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/sys/cam/ctl/ctl.c b/sys/cam/ctl/ctl.c index f1de6917953d..72f8597355ec 100644 --- a/sys/cam/ctl/ctl.c +++ b/sys/cam/ctl/ctl.c @@ -1104,8 +1104,8 @@ ctl_isc_ua(struct ctl_softc *softc, union ctl_ha_msg *msg, int len) uint32_t iid; if (len < sizeof(msg->ua)) { - printf("%s: Received truncated message %d < %d\n", - __func__, len, (int)sizeof(msg->ua)); + printf("%s: Received truncated message %d < %zu\n", + __func__, len, sizeof(msg->ua)); ctl_ha_msg_abort(CTL_HA_CHAN_CTL); return; } @@ -1145,15 +1145,15 @@ ctl_isc_lun_sync(struct ctl_softc *softc, union ctl_ha_msg *msg, int len) uint32_t targ_lun; if (len < offsetof(struct ctl_ha_msg_lun, data[0])) { - printf("%s: Received truncated message %d < %d\n", - __func__, len, (int)offsetof(struct ctl_ha_msg_lun, data[0])); + printf("%s: Received truncated message %d < %zu\n", + __func__, len, offsetof(struct ctl_ha_msg_lun, data[0])); ctl_ha_msg_abort(CTL_HA_CHAN_CTL); return; } i = msg->lun.lun_devid_len + msg->lun.pr_key_count * sizeof(pr_key); if (len < offsetof(struct ctl_ha_msg_lun, data[i])) { - printf("%s: Received truncated message data %d < %d\n", - __func__, len, (int)offsetof(struct ctl_ha_msg_lun, data[i])); + printf("%s: Received truncated message data %d < %zu\n", + __func__, len, offsetof(struct ctl_ha_msg_lun, data[i])); ctl_ha_msg_abort(CTL_HA_CHAN_CTL); return; } @@ -1229,8 +1229,8 @@ ctl_isc_port_sync(struct ctl_softc *softc, union ctl_ha_msg *msg, int len) int i, new; if (len < offsetof(struct ctl_ha_msg_port, data[0])) { - printf("%s: Received truncated message %d < %d\n", - __func__, len, (int)offsetof(struct ctl_ha_msg_port, data[0])); + printf("%s: Received truncated message %d < %zu\n", + __func__, len, offsetof(struct ctl_ha_msg_port, data[0])); ctl_ha_msg_abort(CTL_HA_CHAN_CTL); return; } @@ -1238,8 +1238,8 @@ ctl_isc_port_sync(struct ctl_softc *softc, union ctl_ha_msg *msg, int len) msg->port.port_devid_len + msg->port.target_devid_len + msg->port.init_devid_len; if (len < offsetof(struct ctl_ha_msg_port, data[i])) { - printf("%s: Received truncated message data %d < %d\n", - __func__, len, (int)offsetof(struct ctl_ha_msg_port, data[i])); + printf("%s: Received truncated message data %d < %zu\n", + __func__, len, offsetof(struct ctl_ha_msg_port, data[i])); ctl_ha_msg_abort(CTL_HA_CHAN_CTL); return; } @@ -1358,15 +1358,15 @@ ctl_isc_iid_sync(struct ctl_softc *softc, union ctl_ha_msg *msg, int len) int i, iid; if (len < offsetof(struct ctl_ha_msg_iid, data[0])) { - printf("%s: Received truncated message %d < %d\n", - __func__, len, (int)offsetof(struct ctl_ha_msg_iid, data[0])); + printf("%s: Received truncated message %d < %zu\n", + __func__, len, offsetof(struct ctl_ha_msg_iid, data[0])); ctl_ha_msg_abort(CTL_HA_CHAN_CTL); return; } i = msg->iid.name_len; if (len < offsetof(struct ctl_ha_msg_iid, data[i])) { - printf("%s: Received truncated message data %d < %d\n", - __func__, len, (int)offsetof(struct ctl_ha_msg_iid, data[i])); + printf("%s: Received truncated message data %d < %zu\n", + __func__, len, offsetof(struct ctl_ha_msg_iid, data[i])); ctl_ha_msg_abort(CTL_HA_CHAN_CTL); return; } @@ -1396,8 +1396,8 @@ ctl_isc_login(struct ctl_softc *softc, union ctl_ha_msg *msg, int len) { if (len < sizeof(msg->login)) { - printf("%s: Received truncated message %d < %d\n", - __func__, len, (int)sizeof(msg->login)); + printf("%s: Received truncated message %d < %zu\n", + __func__, len, sizeof(msg->login)); ctl_ha_msg_abort(CTL_HA_CHAN_CTL); return; } @@ -1436,15 +1436,15 @@ ctl_isc_mode_sync(struct ctl_softc *softc, union ctl_ha_msg *msg, int len) uint32_t initidx, targ_lun; if (len < offsetof(struct ctl_ha_msg_mode, data[0])) { - printf("%s: Received truncated message %d < %d\n", - __func__, len, (int)offsetof(struct ctl_ha_msg_mode, data[0])); + printf("%s: Received truncated message %d < %zu\n", + __func__, len, offsetof(struct ctl_ha_msg_mode, data[0])); ctl_ha_msg_abort(CTL_HA_CHAN_CTL); return; } i = msg->mode.page_len; if (len < offsetof(struct ctl_ha_msg_mode, data[i])) { - printf("%s: Received truncated message data %d < %d\n", - __func__, len, (int)offsetof(struct ctl_ha_msg_mode, data[i])); + printf("%s: Received truncated message data %d < %zu\n", + __func__, len, offsetof(struct ctl_ha_msg_mode, data[i])); ctl_ha_msg_abort(CTL_HA_CHAN_CTL); return; }