From nobody Fri Apr 21 21:20:23 2023 X-Original-To: dev-commits-src-branches@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 4Q36r847Bfz46vXw; Fri, 21 Apr 2023 21:20:24 +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 4Q36r76CX1z3JVm; Fri, 21 Apr 2023 21:20:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682112023; 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=s4FX7gyuUgJ/SbbTA2x2ZgPhI6j4Z4Ng1Tev3eSkPrk=; b=mlgIdCS8XSjzdUaxz/1AV6jDlZAmrvDmnsnM7FKOI+2tLwZ6sLXeHPofdtMmnxoqBBVOou 1FZ8/zq9Ff/Y0cqNhI2zq7EDHpcJtwiubhGNRhcUjXS4Aewc6UMxsw0zO5HQHx+k4hNuPW 4KAKNwzHZzxyXeuIAKuQ5JhX+WyPaWhUke2cph+5buaIU+moOX2rXKqzE0O99EXlkPjT0/ 0klkWP5LeKcaMqjJJyKhMFFr8PcPdEjdMscPrvGUFpYgr2JmyUbHOBQZPW8j3DI9QYIaRY wL75TCU9tgj2NFmg/4c3+HH/quv0DvRAxTOQ/JtSn8S3matuSP05lG32MTEEHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682112023; 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=s4FX7gyuUgJ/SbbTA2x2ZgPhI6j4Z4Ng1Tev3eSkPrk=; b=aJKDHzU31zw6bIrH/VmbYHv1HMagUEGh0NMbQz+T6V7KaoadVStRr/JEmcxFHyhoqDTqtl +bT2d0Gbeo9PnYeO/DYTyxku3xn9894ZHbiO6Gvr/bDJz2Dmm+Gr+5qFTohv07K1W4DSfo +osgZQk2BMHp6uV68wanO3h8tBo0UuhX8B7468dCDD0/CqSxO65BBk1KOM09myLyakihzb AFMWQ2r8BUTjMG9f45+pHi4KUK5M9uQQQueZUB+Au4+2uAAkTJ6TzTDfERhjtCfwLxrgBU VE+2g7vTDAwHWO4NW295N81YSOGfvtwE9f9bV8/5eUfccBUR7UJu+rOt0qg+Xg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682112023; a=rsa-sha256; cv=none; b=gmSj8LXsRE9QUnQml/3G0mEYEJwzfPD2PSiubQZhT34DisFf4dKnIewJczSmDe9Dg6Tr3b 10d4VOB4Ne7JSFTBOhT9nxZb/VeOMIFRPn3BxPg2sK1uecjGclyVNOwMf9nkXeT70GusA/ z11Rb9NODiC2ezQ/0xf1OOYbso3R8nbllkrc1f1DA1YMpi8soH2/zr0Gno3ieYtlKk7Une bIHwg/ZsuIGJ6b7JTT3ZVy36TG0hQaXfTNShPhJ6+vP9WcpnIj9JFnxsQirp2QQPWWLZvv IHoysuA/QHN2bgBqCYk0hkkErQjsaugOnj8f/aftlnJ0awHuATAEe9JgklTyvw== 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 4Q36r75Js9zbZg; Fri, 21 Apr 2023 21:20:23 +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 33LLKNqC020952; Fri, 21 Apr 2023 21:20:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33LLKNH5020951; Fri, 21 Apr 2023 21:20:23 GMT (envelope-from git) Date: Fri, 21 Apr 2023 21:20:23 GMT Message-Id: <202304212120.33LLKNH5020951@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: 775defbe0c23 - stable/13 - makefs: use unsigned and %u for rock_ridge_move_count List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: 775defbe0c2346aad87e313f9d56e973ad8a245d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=775defbe0c2346aad87e313f9d56e973ad8a245d commit 775defbe0c2346aad87e313f9d56e973ad8a245d Author: Ed Maste AuthorDate: 2023-04-10 22:53:53 +0000 Commit: Ed Maste CommitDate: 2023-04-21 21:19:48 +0000 makefs: use unsigned and %u for rock_ridge_move_count For diff reduction against NetBSD's makefs. Based on NetBSD git mirror commit 00991aee8248. With this change our makefs cd9660 support should be in sync up to NetBSD commit bdae6c9dc792 ("makefs(8): Nix trailing whitespace."). Sponsored by: The FreeBSD Foundation (cherry picked from commit 10854bf51747c172e45e365995ccf42aef2ab470) --- usr.sbin/makefs/cd9660.c | 2 +- usr.sbin/makefs/cd9660.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/makefs/cd9660.c b/usr.sbin/makefs/cd9660.c index 4d82a8dc93a1..0c9be8274643 100644 --- a/usr.sbin/makefs/cd9660.c +++ b/usr.sbin/makefs/cd9660.c @@ -1255,7 +1255,7 @@ cd9660_rrip_move_directory(iso9660_disk *diskStructure, cd9660node *dir) return NULL; diskStructure->rock_ridge_move_count++; - snprintf(newname, sizeof(newname), "%08i", + snprintf(newname, sizeof(newname), "%08u", diskStructure->rock_ridge_move_count); /* Point to old parent */ diff --git a/usr.sbin/makefs/cd9660.h b/usr.sbin/makefs/cd9660.h index f271e0425517..4cd8cd471672 100644 --- a/usr.sbin/makefs/cd9660.h +++ b/usr.sbin/makefs/cd9660.h @@ -249,7 +249,7 @@ typedef struct _iso9660_disk { int rock_ridge_enabled; /* Other Rock Ridge Variables */ char *rock_ridge_renamed_dir_name; - int rock_ridge_move_count; + unsigned rock_ridge_move_count; cd9660node *rr_moved_dir; int archimedes_enabled;