From nobody Thu Oct 06 21:33:42 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 4Mk4Sk5tN8z4V7S9; Thu, 6 Oct 2022 21:33:58 +0000 (UTC) (envelope-from kp@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Mk4Sk5N5nz3s44; Thu, 6 Oct 2022 21:33:58 +0000 (UTC) (envelope-from kp@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665092038; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=GGxA58zzlngJY096+X9uJLENANyABxNbg/4gHK2d4zY=; b=JNxMVcMaCIvyOxRCdaF9YWPXFH6601bI6SLh0HliAMQMCRWGnX8gS5UQ5wZypR6QH/5ALX 4RHJfiTW75XqBMzUsqG5qXy7cITjoi+dRGG6lHgrBjt7ngLLZVCpaxPhYQkKlVsIAGoHsd sF5aISxE9MGnIip/N274/0YrdHuR385IoG5kckZ+AFR0EKB1XQ1o3mBM0u9vl/tzqsWfBG G4LdrTqn8Wkb+p4rjiK46V+jEKtkFFIt7l0n41CgCdDmfxcpDApMn8PI5TM7JuxfHtA2nV g662q/9jmiBWlnfrVxcA0+ziUOAtLIAjImOKr37CoYz9LMa4Rqgaq27RaHtKNw== Received: from venus.codepro.be (venus.codepro.be [5.9.86.228]) (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 (2048 bits) client-digest SHA256) (Client CN "mx1.codepro.be", Issuer "R3" (verified OK)) (Authenticated sender: kp) by smtp.freebsd.org (Postfix) with ESMTPSA id 4Mk4Sk3gB0zZKm; Thu, 6 Oct 2022 21:33:58 +0000 (UTC) (envelope-from kp@freebsd.org) Received: by venus.codepro.be (Postfix, authenticated sender kp) id 9527219DE1; Thu, 6 Oct 2022 23:33:56 +0200 (CEST) Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable From: Kristof Provost 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 (1.0) Subject: Re: git: a7b568109ec7 - main - nvmecontrol: Fix i386 build Date: Thu, 6 Oct 2022 22:33:42 +0100 Message-Id: <265ACE07-5B60-45FA-8B17-2F8A9A2A6F15@freebsd.org> References: <202210061837.296Iblrk093109@gitrepo.freebsd.org> Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org In-Reply-To: <202210061837.296Iblrk093109@gitrepo.freebsd.org> To: Cy Schubert X-Mailer: iPhone Mail (20A380) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665092038; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=GGxA58zzlngJY096+X9uJLENANyABxNbg/4gHK2d4zY=; b=YKpacFJ2I76RZUQ2ylZsOxcu+Exa9ihfWbmQCH2FznRuYR8GHp07+VgYmxZio2UlXshkFB rS5h8Fi3yJDPIzTRyAre3iSmBUx9ASn/poTeojLBHDdCpHtZ85ioQZU1BOs2wE/ec5hNO4 5X9HYkb36cS+A+SBzw1Gl+T2YesVNoTPK/lwMxU/LLzRNTlvWLxBIUivmBieVDDNDfJUKf vdHJiNyMgxBeocVnTQhqV7OCQp+udmi87/38UHAyv9/fWvJfqVzvMr6nZZo5honpKLDfho BqDo38uRALYUfLh/gORbo96eAn2270y+1W19kpeyIgHeFmG+KrR5Z4YK7Vxcdg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665092038; a=rsa-sha256; cv=none; b=lkMu8Jyo0Mu4IAS4X8FwuLmXCf0T1yw9lowWRaE71R7O+vNbAckt6aVc7RlJRCQ8AN+MeL lYF5eKpnFnaJQxbUe4yOtwjc7TYB2ogPjsmrnAK9p1e+jZDd2cJrDsH3fTYlr/n0LU8kFy wvxcLYhW+MICGssfFgUVLbDb+TOuO05LUE8b0hJ438VCrF5XnJaSuntaUojNd8YvxmTcTy xgktN8w7kBmtE/hW6cO+HEGi9um4NN/erdSFQfDPDZqcHmwOdTOO0K9bxsA+/6ybfXU+cy WXvZl0b5gYiPF7ZVJ9pXS1hDYgDwMTGq0RcceWH5xGcG7oEVQBPofK6DTcpesA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N Thanks.=20 I had a make universe running to test the same fix, but got ambushed by dinn= er and haven=E2=80=99t been able to commit yet.=20 Kristof > On 6 Oct 2022, at 19:37, Cy Schubert wrote: >=20 > =EF=BB=BFThe branch main has been updated by cy: >=20 > URL: https://cgit.FreeBSD.org/src/commit/?id=3Da7b568109ec74fbbd49a16c99e7= e3ba584ab0eac >=20 > commit a7b568109ec74fbbd49a16c99e7e3ba584ab0eac > Author: Cy Schubert > AuthorDate: 2022-10-06 17:56:48 +0000 > Commit: Cy Schubert > CommitDate: 2022-10-06 18:26:50 +0000 >=20 > nvmecontrol: Fix i386 build >=20 > Fix: >=20 > --- all_subdir_sbin --- > /opt/src/git-src/sbin/nvmecontrol/modules/samsung/samsung.c:149:64: > error: format specifies type 'unsigned long' but the argument has type > 'uint64_t' (aka 'unsigned long long') [-Werror,-Wformat] > printf(" Read Reclaim Count : %lu\n", > le64dec(&temp->rrc)); > ~~~ > ^~~~~~~~~~~~~~~~~~~ > %llu > /opt/src/git-src/sbin/nvmecontrol/modules/samsung/samsung.c:150:64: > error: forma t specifies type 'unsigned long' but the argument has type= > 'uint64_t' (aka 'unsigned long long') [-Werror,-Wformat] > printf(" Lifetime Uncorrectable ECC Count : %lu\n", > le64dec(&temp->lueccc)); > ~~~ > ^~~~~~~~~~~~~~~~~~~~~~ > %llu > 2 errors generated. >=20 > Fixes: 84e86788705c176cc195e4a9831c0be08dcece31 > --- > sbin/nvmecontrol/modules/samsung/samsung.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) >=20 > diff --git a/sbin/nvmecontrol/modules/samsung/samsung.c b/sbin/nvmecontrol= /modules/samsung/samsung.c > index 50f0a89db13b..75d8e1064c93 100644 > --- a/sbin/nvmecontrol/modules/samsung/samsung.c > +++ b/sbin/nvmecontrol/modules/samsung/samsung.c > @@ -146,8 +146,8 @@ print_samsung_extended_smart(const struct nvme_control= ler_data *cdata __unused, > print_temp(le16dec(&temp->ct)); > printf(" Capacitor Health : %u\n", le16dec(&t= emp->ch)); > printf(" Reserved Erase Block Count : %u\n", le32dec(&t= emp->luurb)); > - printf(" Read Reclaim Count : %lu\n", le64dec= (&temp->rrc)); > - printf(" Lifetime Uncorrectable ECC Count : %lu\n", le64dec= (&temp->lueccc)); > + printf(" Read Reclaim Count : %ju\n", le64dec= (&temp->rrc)); > + printf(" Lifetime Uncorrectable ECC Count : %ju\n", le64dec= (&temp->lueccc)); > printf(" Reallocated Block Count : %u\n", le32dec(&t= emp->lurb)); > printf(" Power on Hours : %s\n", > uint128_to_str(to128(temp->poh), cbuf, sizeof(cbuf))); >=20