From nobody Thu Oct 06 18:37:47 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 4Mk0YR35S2z4fCMd; Thu, 6 Oct 2022 18:37:47 +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 4Mk0YR2YxJz3g2w; Thu, 6 Oct 2022 18:37:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665081467; 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=tYfHEeJDxxHfM2i5mSWguqMEE21T2MUxaKzY7PJrLNI=; b=Ou+lpoysaeJhDYuSAO6aEJOJSSG0He9fl4wJaLfuNrYVnbuH9YArZtps3yy8ZdEGOce5/r 7dk7ioOeGs6sYD7B2h4fM1NT9sjLFz4PYkStysYgDwlM4NtU6J+Gz6COw1mlGMUMw6h29+ VnO/P5wNhGNH8elvgtnjLcq27CKFFBGJjTatuD5jROB3Z/9c/PAyVf9iBdt7iVhENfvbTa xi0wxJPeI6P3TCXAnnB9fo7nu9tASpSZC6k+qWHJS5662SVmjuruv33+Ln/Z1TktE2QJ15 T44J19t3A/9mMlXzy66A/MAtSMzxa9cklVVPshymBeQoqTs2zNiaOkgGbDO2gw== 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 4Mk0YR1VVbzLLD; Thu, 6 Oct 2022 18:37:47 +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 296Ibl7b093111; Thu, 6 Oct 2022 18:37:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 296Iblrk093109; Thu, 6 Oct 2022 18:37:47 GMT (envelope-from git) Date: Thu, 6 Oct 2022 18:37:47 GMT Message-Id: <202210061837.296Iblrk093109@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: a7b568109ec7 - main - nvmecontrol: Fix i386 build 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 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a7b568109ec74fbbd49a16c99e7e3ba584ab0eac Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665081467; 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=tYfHEeJDxxHfM2i5mSWguqMEE21T2MUxaKzY7PJrLNI=; b=mMOpiUCfBwUrh8yJKEP6jZk5ilAx47gBtCfs1W+f0v8QnG2SAiIaQboWkIAMXxFXQK9Pv2 0aUYqSD2G6K44j8C5S0669hRY6fRNupGxMSIPdpmTi48nA83vNwu7uR5zr/ku8YIVDEIJh vb9tXW1g3r7OwV8Qy9vi7H9xelcsPOfeQHwwdqqJTmkWBKsHhJOkXeYAq8WT27L5lq7YD9 CjhDfqbu0kWWSSbuCJwE0JiKCwngrjqPzMbDZ8qjoNkFs2AcY3MTRsQACEEU2xuNKn6Pwy ftUirHLwRX5ZqvUYViJpyGVwxAEAmIPugmN8nlv1HUhqrIyE6VmFgpUNOELQJQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665081467; a=rsa-sha256; cv=none; b=YAe8Hl58Z9MKc95Vd8vsoTeA/6dip23jB5FikqMb1mfUUe/hWu77b5bXjRnVrvHU6SisXn Urwn/j2h/r+rMMBuINilR18LT8s+UPvt8bl3oz9PSVH+9f2w+enKl1Z7KfaBCtwNhEHtYA v2HjAbe3laySnUXI6NB4qMcHbFN/tIMHAR8thGIin/R/k8Ki+71BRjkZBkoTRg8KKC/kre 4YngCgTFZ7ErJ89YIHp9oE/LvByE1mEXvdc0gzsmyAb5OnnGIgPQt6rC3G2JPvm+yoXgXc PLLD9k+bNQdr+iRJFC8EzQKei3XYUv6qILXqE/s6aprsEl5rjAoc8MW0LG7tPQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=a7b568109ec74fbbd49a16c99e7e3ba584ab0eac commit a7b568109ec74fbbd49a16c99e7e3ba584ab0eac Author: Cy Schubert AuthorDate: 2022-10-06 17:56:48 +0000 Commit: Cy Schubert CommitDate: 2022-10-06 18:26:50 +0000 nvmecontrol: Fix i386 build Fix: --- 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. Fixes: 84e86788705c176cc195e4a9831c0be08dcece31 --- sbin/nvmecontrol/modules/samsung/samsung.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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_controller_data *cdata __unused, print_temp(le16dec(&temp->ct)); printf(" Capacitor Health : %u\n", le16dec(&temp->ch)); printf(" Reserved Erase Block Count : %u\n", le32dec(&temp->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(&temp->lurb)); printf(" Power on Hours : %s\n", uint128_to_str(to128(temp->poh), cbuf, sizeof(cbuf)));