From nobody Fri Mar 31 14:06:09 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 4Pp2Bn3WtNz42nYv; Fri, 31 Mar 2023 14:06:09 +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 4Pp2Bn2vJRz43Xs; Fri, 31 Mar 2023 14:06:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680271569; 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=NV2/mUJt4P6TwTMBdbZo7BuTQ6YG1spcbbBiqnTnAfI=; b=WYupT5Hu+g7qh7Pt6t9Nad0y4t4ERMlSZT6w62I9j5UPoDJ10QR5VYOEKfocaoCF86qYM2 gD9ZtMNDbP+ggKssw0/sAGeDSe6P5dZR8B9X29uBGQkn2Iwsxj01/Sv1ZXg4Rt5kwCKvwX BAZLMGgbh8/TJ9hFb197EJ5/O0fSP5xenugLgH1Dzf7gn7mx/NFkOhg+eAPU6VfMUtK1hw Gl/n8DXatnexDkw53mtkif77ryjCCa/tjcJy80NdmVw1q8TwHLqG3KBe68xDCAWx70whWv mSM4u/nUX2CahbUiz4PG4/Z2ZFcKRQquSUNf8ZFsomhaRWzL/CpzSqMejyxR5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680271569; 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=NV2/mUJt4P6TwTMBdbZo7BuTQ6YG1spcbbBiqnTnAfI=; b=v17zlTMHDdYdITV9+YYM33qIE+ZTgcwz5FhtJJ+mIu+PypAWwhIFaHZ931u9Z29ScqwetK yeKkWba+SQbgqkVDjBl65aVcgkJnWDJoKMELA/Q9ze1GvdcT/5GDrAi9zsZ75nmehAqZX4 0+5mtM1nqnECVgkODwkVznlqQwXe+alL0zKuQRT9F3Mlq4seM81OkAJRob3XiJv/o5+Kt5 CM4/MU8bOmmEV5/fL25Di1Ji35cA8VP9yNSD1yUI+iNF5+paj/x+JUr0uzMorynaTk4I3/ x0tu52LqGNevKvepkuEsFKfqVEu9vPLirnLEs0e7gYMndAc0/1++DHzGmyyutQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680271569; a=rsa-sha256; cv=none; b=cIiG2G3N0kzAeEkd9aQ4S1gQ8C6b4iVMZLLk6YvNM1mO1VyUCIRMEB6z8Vvxm+4khFSfEx oXR3q+cJLdgpf270BhGUADgTeQRH9rs8aFN1vQLPXNMU5FL3Muxp7PJor2JcHPxHCn033J hl1usZPJOrhvySiq+t9VDiJPlLNHIGkFXoQaZsyyoXB03peEB8LrbaubqANC6FLIw2PmfY o5F9EBWX7Xm3ePtTR5tVC2J+25snM1F62fg3I8AxDkMc6m5DOlLfDMW7QnNCngbVNpVqD1 MG2zxh5PWcVG4s/aOoJURE1aeKWPCqPEiX/io6E2vMb7aik1wHBR/8+vLcRBXA== 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 4Pp2Bn1xdGzwk0; Fri, 31 Mar 2023 14:06:09 +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 32VE695w000631; Fri, 31 Mar 2023 14:06:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32VE69wG000630; Fri, 31 Mar 2023 14:06:09 GMT (envelope-from git) Date: Fri, 31 Mar 2023 14:06:09 GMT Message-Id: <202303311406.32VE69wG000630@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: c6ed8694ac58 - main - makefs: improve some cd9660 error messages 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: c6ed8694ac58c8b81a5e4944cb96c2fa19b6ca79 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=c6ed8694ac58c8b81a5e4944cb96c2fa19b6ca79 commit c6ed8694ac58c8b81a5e4944cb96c2fa19b6ca79 Author: Ed Maste AuthorDate: 2023-03-30 23:36:37 +0000 Commit: Ed Maste CommitDate: 2023-03-31 14:03:05 +0000 makefs: improve some cd9660 error messages Obtained from: OpenBSD Sponsored by: The FreeBSD Foundation --- usr.sbin/makefs/cd9660.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/usr.sbin/makefs/cd9660.c b/usr.sbin/makefs/cd9660.c index 7a795f82bd16..40b2488e99e5 100644 --- a/usr.sbin/makefs/cd9660.c +++ b/usr.sbin/makefs/cd9660.c @@ -334,7 +334,7 @@ cd9660_arguments_set_string(const char *val, const char *fieldtitle, int length, int len, test; if (val == NULL) - warnx("error: The %s requires a string argument", fieldtitle); + warnx("error: '%s' requires a string argument", fieldtitle); else if ((len = strlen(val)) <= length) { if (testmode == 'd') test = cd9660_valid_d_chars(val); @@ -346,10 +346,10 @@ cd9660_arguments_set_string(const char *val, const char *fieldtitle, int length, cd9660_uppercase_characters(dest, len); return 1; } else - warnx("error: The %s must be composed of " - "%c-characters", fieldtitle, testmode); + warnx("error: '%s' must be composed of %c-characters", + fieldtitle, testmode); } else - warnx("error: The %s must be at most 32 characters long", + warnx("error: '%s' must be at most 32 characters long", fieldtitle); return 0; }