From nobody Fri Feb 25 16:39:56 2022 X-Original-To: dev-commits-src-main@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 028E719DB30B; Fri, 25 Feb 2022 16:40:08 +0000 (UTC) (envelope-from yuri@aetern.org) Received: from out4-smtp.messagingengine.com (out4-smtp.messagingengine.com [66.111.4.28]) (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 mx1.freebsd.org (Postfix) with ESMTPS id 4K4wVb1r6qz4jWH; Fri, 25 Feb 2022 16:40:07 +0000 (UTC) (envelope-from yuri@aetern.org) Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.nyi.internal (Postfix) with ESMTP id 4C10C5C0194; Fri, 25 Feb 2022 11:40:00 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Fri, 25 Feb 2022 11:40:00 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=aetern.org; h=cc :content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to; s=fm2; bh=oigyXEtp7VUrPi qoHvR0EXvyaUQGaCYuKU3FUUzImg4=; b=FzpJeUR7+A5Ax73EAyEFlYMJAAM4XK T9ecLdw3pz5WAwTTv0BJL20tZzx/5zulIk0Lu59klh0Sx1guKf6PEW6kkfw+Un2n rBcoBekQqUq9gWLTY0Tmc+OYxsUwJTEjRCNS8DsJ6dUbIeY0N9PNQfzQiuQ5uthB W9LkpDdZ0/Pd443YJtDx0TwRAfXg8Nl9uVR7ObTbM150jNAJD5ixvzMAQ7ZuQqKo Tgj6TW6pLipvT/no8B+Mpm5+RfFRb+4e/KeV+193FKQYkZcEoIGqcRpuD0aLE52q 4SQjes7i+UqQN+PDjQOTE92OZmWHSQylZQniRlBZ1EZiOmfBEq6NQIXQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:date:from:from:in-reply-to:in-reply-to:message-id :mime-version:references:reply-to:sender:subject:subject:to:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=oigyXEtp7VUrPiqoHvR0EXvyaUQGaCYuKU3FUUzImg4=; b=GBg6kJKX Zplc3itA9wtyqCipa3g/hfk5P7urwQqHu595iF2/410IUdgZ+X3uuK6MwDwFD3C7 bBk67eLp6vBd3d1iXQAUs4OLsJghdo+Pgm46adZL1JGp+gmx5zFgSk2QXzQUsdoz DDUk2LVxVWf4eiJohzhq4SmE9H7gqB6h+nTVcyPCwkwNSgLmT5lW11S0FDeoJe+J uGxSaiQAzwbv8KXvISQp0JIt+pBe5rxksJYhoQdVyttujZsmy/yWJ75qyYJKIc+J 4dTDqKdTs+6SLC0/lPRGjtggjlzl9FppypO+ToGXLxeiVB/5CpMMBldbOhqaHVQI 1rg924JiR32V3Q== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvvddrleeggdeludcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhepkfffgggfuffvfhfhjggtgfesthejre dttdefjeenucfhrhhomhepjghurhhiuceohihurhhisegrvghtvghrnhdrohhrgheqnecu ggftrfgrthhtvghrnhepgeehleevueehhffggfetteffieffhfduteduteeuvdehvdfhff dvtefhffejjedvnecuffhomhgrihhnpehfrhgvvggsshgurdhorhhgnecuvehluhhsthgv rhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhephihurhhisegrvghtvghrnh drohhrgh X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 25 Feb 2022 11:39:58 -0500 (EST) Message-ID: <234f38c8-e936-a655-40b7-e6eccc983a26@aetern.org> Date: Fri, 25 Feb 2022 19:39:56 +0300 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.6.1 Subject: Re: git: 05c3e8e87142 - main - Fix 32-bit build after 530d274c15e5. Content-Language: en-US To: Alexander Motin , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202202242311.21ONBfsT061491@gitrepo.freebsd.org> From: Yuri In-Reply-To: <202202242311.21ONBfsT061491@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4K4wVb1r6qz4jWH X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=aetern.org header.s=fm2 header.b=FzpJeUR7; dkim=pass header.d=messagingengine.com header.s=fm2 header.b=GBg6kJKX; dmarc=none; spf=pass (mx1.freebsd.org: domain of yuri@aetern.org designates 66.111.4.28 as permitted sender) smtp.mailfrom=yuri@aetern.org X-Spamd-Result: default: False [-4.60 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[aetern.org:s=fm2,messagingengine.com:s=fm2]; FREEFALL_USER(0.00)[yuri]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; R_SPF_ALLOW(-0.20)[+ip4:66.111.4.28]; DMARC_NA(0.00)[aetern.org]; RWL_MAILSPIKE_GOOD(0.00)[66.111.4.28:from]; DWL_DNSWL_LOW(-1.00)[messagingengine.com:dkim]; RCVD_COUNT_THREE(0.00)[4]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; DKIM_TRACE(0.00)[aetern.org:+,messagingengine.com:+]; NEURAL_HAM_SHORT(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; MLMMJ_DEST(0.00)[dev-commits-src-all,dev-commits-src-main]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:19151, ipnet:66.111.4.0/24, country:US]; MID_RHS_MATCH_FROM(0.00)[]; RCVD_IN_DNSWL_LOW(-0.10)[66.111.4.28:from] X-ThisMailContainsUnwantedMimeParts: N Alexander Motin wrote: > The branch main has been updated by mav: > > URL: https://cgit.FreeBSD.org/src/commit/?id=05c3e8e87142a8689503a6731237b48fb43c1bec > > commit 05c3e8e87142a8689503a6731237b48fb43c1bec > Author: Alexander Motin > AuthorDate: 2022-02-24 23:10:47 +0000 > Commit: Alexander Motin > CommitDate: 2022-02-24 23:11:36 +0000 > > Fix 32-bit build after 530d274c15e5. > > MFC after: 3 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 a772c0fd92e1..d6859716bcaa 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 < %lu\n", > - __func__, len, sizeof(msg->ua)); > + printf("%s: Received truncated message %d < %d\n", > + __func__, len, (int)sizeof(msg->ua)); Sorry for chiming in but don't we have 'z' (i.e. "%zu") modifier exactly for size_t arguments? > 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 < %lu\n", > - __func__, 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])); > 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 < %lu\n", > - __func__, 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])); > 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 < %lu\n", > - __func__, 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])); > 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 < %lu\n", > - __func__, 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])); > 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 < %lu\n", > - __func__, 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])); > 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 < %lu\n", > - __func__, 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])); > 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 < %lu\n", > - __func__, len, sizeof(msg->login)); > + printf("%s: Received truncated message %d < %d\n", > + __func__, len, (int)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 < %lu\n", > - __func__, 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])); > 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 < %lu\n", > - __func__, 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])); > ctl_ha_msg_abort(CTL_HA_CHAN_CTL); > return; > } >