From nobody Fri Apr 14 12:53:00 2023 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 4Pybvx3f5tz45BvN; Fri, 14 Apr 2023 12:53:01 +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 4Pybvw5mDPz3s6w; Fri, 14 Apr 2023 12:53:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681476780; 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=Uq6VLVu5Vq9InodSGJid0fr2jxxWyzRy7PefSJLx9Sk=; b=AdHB69pfIQltHYMquZ9UwMpCG6mb/GjqVXV1WbQogcnpv9U3pMSmEcDi6SYtTrnB7aalII dtQkGFSf2K8X7veuiB7n3JM0aOM41BQgLT7anve3KUTtQPTDH7E28gie/Te9xXFavcZKzk 2iaAtIWm5RPk4qVvatCj52qb+vQlvrsHTr9O5etlQU+nYxOnQ8PQmculf6zDwoghvLqxw9 VefUOUoFhreGGgiiVHbRMVwGleqSZHQYfj7TRO0z/NUPuAxSk3gYwZMPRQpv4VacuCqkbo 9oQnvKrS9JBz+jLQhvRikbkXroKba1B7E/TLkrYzF33TbAhg1M0SLI3Qo1Y4Fg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681476780; 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=Uq6VLVu5Vq9InodSGJid0fr2jxxWyzRy7PefSJLx9Sk=; b=jEWjgM0Ms5gKlMWkhHQBLxuipTXAMR82r6ZBSz8Qo4tTpUvA8LjbrU/HOmyhUr0M8nJIPt WIVq2g5tRmIt98dJHcPdG/xl3o0xZhWUsWiHXceHAycvN3khTJZae4admwuZe6/2doXyxe xUYCYOZTT+shlxm5uzdPIxPuYbLd2+8iwYhFAGFSbGGL99LZhhwgsZRwI3j1q/cewxmV8Y GzXjhroTKuPliOX7ujFRXggvJC1cKrswhyGaqOGABmAj0J2njiRW0KvJoorSbOg+6bNiTl 92COGhQYbBpXcuLwzLidRWW4RMDl1ckSVvMDS9AmeV6Wir37yRFri1Cq9fb+BQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681476780; a=rsa-sha256; cv=none; b=DXbHGu5Uj47Yrwz8KV/dIi5q+5Ea+U4L8SJG7DvwKqJSj3csZA7kYjaR9/8BkM1xtl5Sep YY5p8jrFFwh/INcsHUI+onYqLTkKxusQlsqPzi/NpSFvzR5thIUlH5AN1zpyIYCDaxwfXN C4LolPQCzND1Q6ZnI293qcjGNG6t+PQKkxrsuIklBfRaT3flKtrlJS/mpHh7nqL0FF+vQU 8Q0Wc3tUuSEH8F57Q+d9HVTF83kY71tQUoYriW1uf7AAsG3+Z48ieGnD0z0cDDLFPs7k0K XdVJhQVELrpMf39E9jQk5BESQZdSzCTsKActJIemOK3Kc5plhbXr4JFjiM+1nQ== 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 4Pybvw2xPvzQ5y; Fri, 14 Apr 2023 12:53:00 +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 33ECr041074951; Fri, 14 Apr 2023 12:53:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33ECr0i5074950; Fri, 14 Apr 2023 12:53:00 GMT (envelope-from git) Date: Fri, 14 Apr 2023 12:53:00 GMT Message-Id: <202304141253.33ECr0i5074950@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 72ef847c171f - stable/13 - makefs: use %s and __func__ in printf messages 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 72ef847c171f175c7e0a6da5aa31497fe42d4f6d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=72ef847c171f175c7e0a6da5aa31497fe42d4f6d commit 72ef847c171f175c7e0a6da5aa31497fe42d4f6d Author: Ed Maste AuthorDate: 2023-04-11 15:19:06 +0000 Commit: Ed Maste CommitDate: 2023-04-14 12:10:38 +0000 makefs: use %s and __func__ in printf messages For diff reduction against NetBSD. Obtained from: NetBSD 0c4125e1a19f Sponsored by: The FreeBSD Foundation (cherry picked from commit af7624ed314574d6da1eb45b9fddbd2ad503fea4) --- usr.sbin/makefs/ffs/buf.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/usr.sbin/makefs/ffs/buf.c b/usr.sbin/makefs/ffs/buf.c index bc91df0b3ed3..11b7c4b0f1f8 100644 --- a/usr.sbin/makefs/ffs/buf.c +++ b/usr.sbin/makefs/ffs/buf.c @@ -132,14 +132,14 @@ bwrite(struct buf *bp) assert (bp != NULL); offset = (off_t)bp->b_blkno * fs->sectorsize + fs->offset; if (debug & DEBUG_BUF_BWRITE) - printf("bwrite: blkno %lld offset %lld bcount %ld\n", + printf("%s: blkno %lld offset %lld bcount %ld\n", __func__, (long long)bp->b_blkno, (long long) offset, bp->b_bcount); if (lseek(bp->b_fs->fd, offset, SEEK_SET) == -1) return (errno); rv = write(bp->b_fs->fd, bp->b_data, bp->b_bcount); if (debug & DEBUG_BUF_BWRITE) - printf("bwrite: write %ld (offset %lld) returned %lld\n", + printf("%s: write %ld (offset %lld) returned %lld\n", __func__, bp->b_bcount, (long long)offset, (long long)rv); if (rv == bp->b_bcount) return (0); @@ -163,13 +163,13 @@ bcleanup(void) if (TAILQ_EMPTY(&buftail)) return; - printf("bcleanup: unflushed buffers:\n"); + printf("%s: unflushed buffers:\n", __func__); TAILQ_FOREACH(bp, &buftail, b_tailq) { printf("\tlblkno %10lld blkno %10lld count %6ld bufsize %6ld\n", (long long)bp->b_lblkno, (long long)bp->b_blkno, bp->b_bcount, bp->b_bufsize); } - printf("bcleanup: done\n"); + printf("%s: done\n", __func__); } struct buf * @@ -181,12 +181,13 @@ getblk(struct vnode *vp, daddr_t blkno, int size, int u1 __unused, void *n; if (debug & DEBUG_BUF_GETBLK) - printf("getblk: blkno %lld size %d\n", (long long)blkno, size); + printf("%s: blkno %lld size %d\n", __func__, (long long)blkno, + size); bp = NULL; if (!buftailinitted) { if (debug & DEBUG_BUF_GETBLK) - printf("getblk: initialising tailq\n"); + printf("%s: initialising tailq\n", __func__); TAILQ_INIT(&buftail); buftailinitted = 1; } else {