From nobody Mon Apr 10 15:15:51 2023 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 4PwCGc19Hrz44Mnw; Mon, 10 Apr 2023 15:15:52 +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 4PwCGb6zvKz3pKL; Mon, 10 Apr 2023 15:15:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681139752; 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=1WMCFIUOhwePnCWjyrbn3qdfKwmK9XL2IVi/Kciqp0M=; b=jX4XAXqDz/HYHxuA3vAu5/CX9lvoLSFkt4EUlj8OmEgC3WWhI3KALYPHaUHXM9b7mexXpE /9x64eOER919LmtbGrwU6cd5xHYb4Q0FkjHtTEjuypuv8rmYGN6dmG8KJFct+x+nPxm9mp mRFmAQTuzW2qJXgNDeTjG4371CLms7PA5gTggFO86pZruCgvsnl29YmVkvmWsKg+L5DglW Ko3B3QvilMkmww9BO4hj58RMDMJHLf5hhvl71W9qfHHd/VE1FJqN317ZxgWjnS1gq1t1by XSs7oxJzxk8vPCcaiMCPyfMnQnSoVL1rcK224C7/Wyuv39FrkUmn7L5C8DJx5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681139752; 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=1WMCFIUOhwePnCWjyrbn3qdfKwmK9XL2IVi/Kciqp0M=; b=Hi/Zse+14iq2doGEyBZXqE18W099Tb+IWLeVi3ua6a3IQ7UgVLjv0DaD2FUaTkvGyKB2+v jj62JY9ICkjQIRAbo0OMsrgVHV/fRQYWiFoOXdXaZ0/iXheS+UU2316biGiKDWKWNNGDYH soTe13cPa3Z001FTEsjAgQghRacipXkHG2OCnKwvEpPAWmLWQKqhK4ZhJK2NPMWbvvY/dY 4F1+XWIOqTJDBVecNSJ9gKvMpdvgJhDBBuwfpJXBp1SnqxMWBpj+pe6i0jnrkqdxAZkYKv ftWecWIz7YqIYp+lsrELV7WADsrZCbEitnEH/mgTF6HRkOBfWRVlLCPkKm+g6A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681139752; a=rsa-sha256; cv=none; b=pAS6uXolFCsaFLig0ZY4uZR4DXILnLfKZdciucZqDe0BFnZxlKe7OfnlcsY5F506YHz7eZ otWnoxX2SsxtI2N8qY0xp/3VEMOf6u0wgTVIENnfm7OXulPItwtlpHYLJRhnun9rKhN5BD FJkUIvHRWqN/dGQjLnGSCN9rDqwJ9HAHAZQuR3/ZPmcuqTWJ7A2KTgxcEPYzx/RVQ71e8q 9zefx7SkljfYzf29gJVI3Mxi7acBr3EEMaKB8nnKoC6rRdGfRV4jIjlAt60Osar8kdbj6s UtrHfX59TPXbfX4IlyL1y87R0QxdmMNPfmzsqTH53L40On0BU0YnQscDg7P+mw== 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 4PwCGb656czvb6; Mon, 10 Apr 2023 15:15:51 +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 33AFFpBk027441; Mon, 10 Apr 2023 15:15:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33AFFpgp027440; Mon, 10 Apr 2023 15:15:51 GMT (envelope-from git) Date: Mon, 10 Apr 2023 15:15:51 GMT Message-Id: <202304101515.33AFFpgp027440@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: d73acb32d334 - main - makefs: remove some unused cd9660 types and defines 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d73acb32d3343d14c29a995160c007aeadfa79f3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=d73acb32d3343d14c29a995160c007aeadfa79f3 commit d73acb32d3343d14c29a995160c007aeadfa79f3 Author: Ed Maste AuthorDate: 2023-03-30 23:31:41 +0000 Commit: Ed Maste CommitDate: 2023-04-10 15:15:34 +0000 makefs: remove some unused cd9660 types and defines Obtained from: OpenBSD Sponsored by: The FreeBSD Foundation --- 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