From nobody Fri Feb 25 16:55:29 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 46B5619DDFD6; Fri, 25 Feb 2022 16:55:30 +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 4K4wrL1V0Gz4lPY; Fri, 25 Feb 2022 16:55:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645808130; 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=vYsUWctYS38QQ4/6xwIRxc7rgmESGCWrkJRu9zplvt4=; b=nWz0CFKTfGrF2Io94EL2E/5/8ryed4bhJQgMCaxGkhrvQ80wPzejjTg5X6kLBRmc8aWYJU 3Cxm9YtycZ/cR8a1IgSHn77etZV4PMPnPDXVuyzHFMu+X7a04ajbzghltAcgcoadneWx9g FojxtS4VV+++HlmD0oV/uk4V5evPYx2WwncWU3aM4EoVjjA07si1lbJbOpKXiODMVALxhz V9BEETO4Wf12gQmiNgz2br+lKkHHoU9tPsZhwGjhE8HI7ppGnfdGCIC65tK2VcSVY06XEc I2U9o5yV24rBTTBNyQ2/24A5p2m7gyfcCrj+KlxHPB8cP0CrvKOdauLXG7aSRQ== 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 0F464230DB; Fri, 25 Feb 2022 16:55:30 +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 21PGtTLx085228; Fri, 25 Feb 2022 16:55:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21PGtTqc085227; Fri, 25 Feb 2022 16:55:29 GMT (envelope-from git) Date: Fri, 25 Feb 2022 16:55:29 GMT Message-Id: <202202251655.21PGtTqc085227@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Motin Subject: git: f00ced06da25 - main - 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/main X-Git-Reftype: branch X-Git-Commit: f00ced06da25540c2057e46033d1c38b4ade7c8b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645808130; 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=vYsUWctYS38QQ4/6xwIRxc7rgmESGCWrkJRu9zplvt4=; b=VixAxlcNg8xcF/4V/gdYWCKAzXZjVmKyBek39kYwSrQMSTEiNce33PkMK4Gmq/C7+mKH6l 65FHhyNxja638TtIDtFMPubEn/Z1ys6iRjm88IQak1EyQ5SLyONOLxeNiKUD7oXZ9wnQL6 3OzFp4nAe8JZUVuvo/8uMzGr4DZEG0flA/F3EemYC9SKTZBoumU5fN3aimH2pochgN20qg gMM++FMWea56F/gl1WBy1JF3yZy+KcI5w5eVde3cnKf0tiLpX+6IaBM7pNHtqndzG5/i+O Y6JKcXSQXtNhbjkI0Vn4oOHi7sl1PiLOhU6dZa8bv+obY7x/rABFiEQoiyIuqA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645808130; a=rsa-sha256; cv=none; b=yVrKew/J07Ede5GX8ViGMkIvsRQCO/VOAFeKNM/J9ai8BlR1JU9PqNEpyxaK4AyHbss0l/ xM4HXzlkVkczPyTi/bwFeyLY/xmJJnViDeUlWgyma5ebULSn8ZAnPeEB1i1mngCGLsC7Uo IbtgZAN1CTlmZH5JsoeyF24hWlvPlv/JvT+RX7vBHF/mkBJ4CW8fb5phXA4zdHSsO+aisy 3DZfC5PNfePMtwCrBTpeLa7oZZcJTi2DAlh/e5OCO956kfcKsgIX7U3lIDqQo+y15JJuVb Cj0W5KYo/Wr7oA3J1cCjRB9T2pCE8bPAv+/3wgjjsJiEFItfSsm7OpweBhEJzg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=f00ced06da25540c2057e46033d1c38b4ade7c8b commit f00ced06da25540c2057e46033d1c38b4ade7c8b Author: Alexander Motin AuthorDate: 2022-02-25 16:52:17 +0000 Commit: Alexander Motin CommitDate: 2022-02-25 16:53:53 +0000 CTL: Rework 05c3e8e87142 using %zu format. MFC after: 2 days --- 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 d6859716bcaa..6d06d4f5ad14 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; }