From nobody Tue Mar 01 03:30:18 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 0EC2419EC18B; Tue, 1 Mar 2022 03:30:19 +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 4K72nQ73Rqz4dfW; Tue, 1 Mar 2022 03:30:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646105419; 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=MJUqru0mmXrZ5uQlvC9IhaafQF3v2bTZ0nxlGiBmU1w=; b=CSL/UOCYVG7ag7+YQeXyeWP3HdEuxNvNrQI3M6rKiEuuT47knTrI7aH9QtfPvcVodZx6xm LFCzJaMqAjQGdQIzZ67hP/fEDT9tHH/33c55CbZFKzMA+O5H9zJ0fuvjKUi5dAUoMLHGQ6 f6Fz0RQ47593nF6UfGdylpMth4/F+wwh6gAhLB+r2i8g7lk5F93VlQtp3bizdKWRZDjkiw GxTHOOreLZVL5Mxy2NA1tt7FZbxQA/15cBgKaR4L0x6YEGW13iTXK71NU4ENhcmz8RV1Xo RW3f8C09mol+4weAhl9zV5wJ1frIaHodJ/BopuSS+sf9KCPq9JNBxEexjQpKeQ== 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 D1DC427BB3; Tue, 1 Mar 2022 03:30:18 +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 2213UIon050042; Tue, 1 Mar 2022 03:30:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2213UIaA050035; Tue, 1 Mar 2022 03:30:18 GMT (envelope-from git) Date: Tue, 1 Mar 2022 03:30:18 GMT Message-Id: <202203010330.2213UIaA050035@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kirk McKusick Subject: git: 3cf2f812f586 - main - Add casts to printf statements to keep armv6, armv7, and powerpc builds happy. 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: mckusick X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3cf2f812f586da2a5e8be1e57e769741e22ac088 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646105419; 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=MJUqru0mmXrZ5uQlvC9IhaafQF3v2bTZ0nxlGiBmU1w=; b=sL28jp/DPYwWdMDyrJQIzEBqiWEligEo7ZQyS656hz2bT3/fP08YCA3pczwyfiEXQxzSq6 Brb96imXH7mxLEt37zbE2wwBShfNOj0xw8/anse1VsU4H+MiVJaXWUq5A7oJfLZF+PXEV1 O4HY5cT+1amtbYh+9Y1zraJvx72CmyDBlXb5fiMtHBwwvNz8z3OYveSXYVpxAa/4Lzy+tD kuINNlUlmkFZHFnT6ULZQ+86PsjuE6CboYC4Xvc8Zr5SacJeKfLaisUmVgtYo0tRCuXTHs BqrAhnq4i7aGi+FZSbhRz0E7fbxws5cMz1lI3g3AfHCVd1K7T9sdA7cSj9eX/A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646105419; a=rsa-sha256; cv=none; b=sCTJoIC3buFLE7E7ZnOEh+PQk3xs/bgtypkaM+adi+jtFwI+hiTSVzbLRMALQtt352MBtY QC/zXdtp75Qldp56wVlSRo8EdIlhwUOBWrEiGMDSar0AiGqPomiFfXntoZh27BIu8fML1I qt8DLaOqL5arLaQqgteYWrk9h6nwAID7xmHrYB7xrM+8AM0NZ7nD8iSVRR0+gC5ZxEbh+t Qsx6tHhs5JBZ7+2NTw/GVxmAlh7+whxVqTfqdoLSNKf3aOTpFZMwUJqHWtDL3B5BB2jux9 24eTEJ7t1aHQfLKU722w60TYDLk9eWbJzczCj1FmYsI5xvAnEHwn4LkFRK2+cA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=3cf2f812f586da2a5e8be1e57e769741e22ac088 commit 3cf2f812f586da2a5e8be1e57e769741e22ac088 Author: Kirk McKusick AuthorDate: 2022-03-01 03:28:02 +0000 Commit: Kirk McKusick CommitDate: 2022-03-01 03:28:02 +0000 Add casts to printf statements to keep armv6, armv7, and powerpc builds happy. --- sys/geom/union/g_union.c | 41 ++++++++++++++++++++++++----------------- 1 file changed, 24 insertions(+), 17 deletions(-) diff --git a/sys/geom/union/g_union.c b/sys/geom/union/g_union.c index a5702d175264..5a4977a5fa57 100644 --- a/sys/geom/union/g_union.c +++ b/sys/geom/union/g_union.c @@ -342,9 +342,9 @@ g_union_ctl_create(struct gctl_req *req, struct g_class *mp, bool verbose) sizeof(uint64_t) + roundup(sc->sc_root_size, BITS_PER_ENTRY); if (verbose) gctl_error(req, "Device %s created with memory map size %jd.", - gp->name, sc->sc_writemap_memory); + gp->name, (intmax_t)sc->sc_writemap_memory); G_UNION_DEBUG(1, "Device %s created with memory map size %jd.", - gp->name, sc->sc_writemap_memory); + gp->name, (intmax_t)sc->sc_writemap_memory); return; fail4: @@ -1241,29 +1241,36 @@ g_union_dumpconf(struct sbuf *sb, const char *indent, struct g_geom *gp, if (pp != NULL || cp != NULL || gp->softc == NULL) return; sc = gp->softc; - sbuf_printf(sb, "%s%ju\n", indent, sc->sc_reads); - sbuf_printf(sb, "%s%ju\n", indent, sc->sc_writes); - sbuf_printf(sb, "%s%ju\n", indent, sc->sc_deletes); + sbuf_printf(sb, "%s%ju\n", indent, + (uintmax_t)sc->sc_reads); + sbuf_printf(sb, "%s%ju\n", indent, + (uintmax_t)sc->sc_writes); + sbuf_printf(sb, "%s%ju\n", indent, + (uintmax_t)sc->sc_deletes); sbuf_printf(sb, "%s%ju\n", indent, - sc->sc_getattrs); - sbuf_printf(sb, "%s%ju\n", indent, sc->sc_flushes); + (uintmax_t)sc->sc_getattrs); + sbuf_printf(sb, "%s%ju\n", indent, + (uintmax_t)sc->sc_flushes); sbuf_printf(sb, "%s%ju\n", indent, - sc->sc_speedups); - sbuf_printf(sb, "%s%ju\n", indent, sc->sc_cmd0s); - sbuf_printf(sb, "%s%ju\n", indent, sc->sc_cmd1s); - sbuf_printf(sb, "%s%ju\n", indent, sc->sc_cmd2s); + (uintmax_t)sc->sc_speedups); + sbuf_printf(sb, "%s%ju\n", indent, + (uintmax_t)sc->sc_cmd0s); + sbuf_printf(sb, "%s%ju\n", indent, + (uintmax_t)sc->sc_cmd1s); + sbuf_printf(sb, "%s%ju\n", indent, + (uintmax_t)sc->sc_cmd2s); sbuf_printf(sb, "%s%ju\n", indent, - sc->sc_readcurrentread); + (uintmax_t)sc->sc_readcurrentread); sbuf_printf(sb, "%s%ju\n", indent, - sc->sc_readblockwrite); + (uintmax_t)sc->sc_readblockwrite); sbuf_printf(sb, "%s%ju\n", indent, - sc->sc_writeblockread); + (uintmax_t)sc->sc_writeblockread); sbuf_printf(sb, "%s%ju\n", indent, - sc->sc_writeblockwrite); + (uintmax_t)sc->sc_writeblockwrite); sbuf_printf(sb, "%s%ju\n", indent, - sc->sc_readbytes); + (uintmax_t)sc->sc_readbytes); sbuf_printf(sb, "%s%ju\n", indent, - sc->sc_wrotebytes); + (uintmax_t)sc->sc_wrotebytes); sbuf_printf(sb, "%s%jd\n", indent, (intmax_t)sc->sc_offset); }