From nobody Mon Apr 17 12:22:54 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 4Q0R5s1cTdz45psJ; Mon, 17 Apr 2023 12:22:57 +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 4Q0R5q1ClVz3Cj7; Mon, 17 Apr 2023 12:22:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681734175; 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=IBya9VDQbZtVmavUEO3wZo12Qtlcml9Ff2DM9gOidNk=; b=ZT5H533yRYYgP0doNZ1P23MzSC/payUqHz5I44S2Jfky60YPsnqdkPWjmnVRVph6xVu/w6 jpwYmQ/wj5X/kajGr4VZq2g1bcXmI0CJOjJ5WxQdnPMY9FADowo4jrwQ+D1858iehLPrhX 59ozEMYl2fw+b953ysR28S0Fr0TaTFMYNGM0sf5adAjtUK2oHLdqD5rAN1iTImtUnXfJ3H p6JklcnPS63p2vwwxxggKc9SrnKoZOu2sbA8zAz9pQxBcFK6In+LCtR7Zz5jx8YelRUWjU G9y9J3fzYgSOhqHXNTLX7EPnwOVEVbiGfdsMKiWB//30l6sLyBipqBfjh1uXlg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681734175; 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=IBya9VDQbZtVmavUEO3wZo12Qtlcml9Ff2DM9gOidNk=; b=ttRKNTJXccT6q4KecefdczsTsmZ2hoFYzqq3dpITglwFfMTynTSgiMMHDa8GhKU9xb5+9U /DNpjDBNidudF5aBrPATtxWDM7BrTJBXn73GZwVvxPCzHbXJ9D3XEy4j5u9/BgexjorGTy 7PZBpllXPDMFvbTJzvRs45MEPj1fbKkrmGDm1Mv705xhbP6YKdQzDR3VIWe3qRjS6PYIxk AsGytojF32s5ywLynFuAd8Xy/fbBRiWHYcpU+T8yzyYtANR0nUbEu9uUpNGZ+5gQxcVCuz T6MPq6pkUj8ODwQf6i+3Ul6aD3Vv/tpo2uXW3QAqdcoFsHt4Bn6qyd4P67c9QA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681734175; a=rsa-sha256; cv=none; b=a3ZuIkrxxhHOj86IzzqGujFwWTlkdug9Bid1juTlacusMLEidwi5FxdLL26Jwt2qeSfVXa sCwjzjFiSMBk81z9/Hm0xT4oKITlfWyW72KsU25c2NbmsMKuo3nY7/z/YdK3FAD1absXNP sCj1yNzDbpelE5be1aWLPjAOsZKDixDtdxOpPiwMvEu9tYjzD0dEx1uJN7bFMVTUnptYxs 56bq4ugJBCS2B39mP48y17V0O4RlMSn+Pccp+Ieha/WSVRard3fXHuKO7EcVA1+cBN4v0c leh4caGagBB+e0YqRRZYlaAk/PrFKs1zJcrcuxAiDtMGRLToDxiN3JA6O/6XBw== 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 4Q0R5q0J7mzSsZ; Mon, 17 Apr 2023 12:22:55 +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 33HCMsZh039741; Mon, 17 Apr 2023 12:22:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33HCMswq039740; Mon, 17 Apr 2023 12:22:54 GMT (envelope-from git) Date: Mon, 17 Apr 2023 12:22:54 GMT Message-Id: <202304171222.33HCMswq039740@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 10854bf51747 - main - makefs: use unsigned and %u for rock_ridge_move_count 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/main X-Git-Reftype: branch X-Git-Commit: 10854bf51747c172e45e365995ccf42aef2ab470 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=10854bf51747c172e45e365995ccf42aef2ab470 commit 10854bf51747c172e45e365995ccf42aef2ab470 Author: Ed Maste AuthorDate: 2023-04-10 22:53:53 +0000 Commit: Ed Maste CommitDate: 2023-04-17 12:21:28 +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 --- 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;