From nobody Fri Apr 14 12:52:55 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 4Pybvt0QT9z45B1N; Fri, 14 Apr 2023 12:52:58 +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 4Pybvr3XtWz3rnb; Fri, 14 Apr 2023 12:52:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681476776; 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=w7ViGMCRxOQ/k6pyEYC7U2uPSxTyHUJRamGqxADK52o=; b=OS4iPYKT6WR2L8kW71ds20Ylg0UZ/KbCNvFHUAVVbcTpkrpwEfIETKxCdmApbEc+JXstQU ZsZGHCvUyU7wdzWYOWiOAuBv7QKxE4TW2hxjG4Csc0O73thEkE+th6BLE/HkUOAh1Ad/qe Ye/ZoVYLDV5g+kIxWTyKMMAQQ3TY/PoSJstxUL+9X0XrYBQuTftDguuGLsRltwW5BwGaF+ LQlVlOABKBRIrZI+iNyM8jWdJvxWkopvOZ9niqbtE9W9Uz/O9AovC9c/43DjXyFECnOQHw /+X8POsdlEVZo4PDwoO1Kb26t/Q48A5jGwedAhN5wty/LxTadiICSolUQ00ILQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681476776; 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=w7ViGMCRxOQ/k6pyEYC7U2uPSxTyHUJRamGqxADK52o=; b=Y4aR3fL4dqO+eApDwDb0YNfsTlDIyDy7vGaFHY9ZlELiI1J5z7jY714z16GRGPWcHwjnEt mqL0LdTU3Lv364ZymmzbCY/juUhNuIRcUDGfG5hxj/GjN5EfLX1649Ha/CgM3fQSUAT+Hb 7IIyRlJTMBEFuMmta5r2eB+x99Fz03up8yt0nJmV44G02/YDvsqRXhYY+jCoEo6LJA3epY S/Vr9xnCcpQCD34GbIToYSME1otknoLwOMrxmuToP2EX4z2ZBUFWjiVY+Czx2PPDGjOD1D y4LqMMLoEbtUSxVy/SkY1KwytZzTnRL5/h8sqQCSVrTVgMctDoyxIZBDxFFrWw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681476776; a=rsa-sha256; cv=none; b=O2lRjwi8ZUAZyrw1DrBNPKBPcFxvnXrPC4fUXc6AKbNZj9GUWLuwznUrXstoUs83vMrwET F3Nthgp0vNgD6UxYO/OghM3TYxgyyQXRd1VX/yO4HYpkcJpCQc71scv2z/zmpGn/o3VtgC T/shd+bgohSxmika3cdimYRFP3ElTo4cOqQ75koZ82mjbQ9/e1xB+TUfneZIqt8fzUl6Pv gbIMZX8BlTjSA6FbBCW6j4kLhob7JHqgZPiqSYoE1QGDXr/hPIra20kK8wBkHhNXSBS90M 5lyMaq+LGykJhWUYvAl090IovwX9u7Scr8J4QOmsD6m+mRZtJ9sG8du+dsor5A== 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 4Pybvq5Xy9zQ3n; Fri, 14 Apr 2023 12:52: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 33ECqtAW074867; Fri, 14 Apr 2023 12:52:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33ECqtGH074866; Fri, 14 Apr 2023 12:52:55 GMT (envelope-from git) Date: Fri, 14 Apr 2023 12:52:55 GMT Message-Id: <202304141252.33ECqtGH074866@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: 511e83ab14a1 - stable/13 - makefs: remove some unused cd9660 types and defines 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: 511e83ab14a162c9806251b7600e40158eb8bc21 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=511e83ab14a162c9806251b7600e40158eb8bc21 commit 511e83ab14a162c9806251b7600e40158eb8bc21 Author: Ed Maste AuthorDate: 2023-03-30 23:31:41 +0000 Commit: Ed Maste CommitDate: 2023-04-14 12:10:38 +0000 makefs: remove some unused cd9660 types and defines Obtained from: OpenBSD Sponsored by: The FreeBSD Foundation (cherry picked from commit d73acb32d3343d14c29a995160c007aeadfa79f3) --- usr.sbin/makefs/cd9660.h | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/usr.sbin/makefs/cd9660.h b/usr.sbin/makefs/cd9660.h index 80b49f86ecf8..c4baa590101a 100644 --- a/usr.sbin/makefs/cd9660.h +++ b/usr.sbin/makefs/cd9660.h @@ -65,31 +65,8 @@ #define INODE_WARNX(__x) #endif /* DEBUG */ -#define ISO_STRING_FILTER_NONE = 0x00 -#define ISO_STRING_FILTER_DCHARS = 0x01 -#define ISO_STRING_FILTER_ACHARS = 0x02 - -/* -Extended preferences type, in the spirit of what makefs gives us (only ints) -*/ -typedef struct { - const char *shortName; /* Short option */ - const char *name; /* option name */ - char *value; /* where to stuff the value */ - int minLength; /* minimum for value */ - int maxLength; /* maximum for value */ - const char *desc; /* option description */ - int filterFlags; -} string_option_t; - /******** STRUCTURES **********/ -/*Defaults*/ -#define ISO_DEFAULT_VOLUMEID "MAKEFS_CD9660_IMAGE" -#define ISO_DEFAULT_APPID "MAKEFS" -#define ISO_DEFAULT_PUBLISHER "MAKEFS" -#define ISO_DEFAULT_PREPARER "MAKEFS" - #define ISO_VOLUME_DESCRIPTOR_STANDARD_ID "CD001" #define ISO_VOLUME_DESCRIPTOR_BOOT 0 #define ISO_VOLUME_DESCRIPTOR_PVD 1