From nobody Fri Apr 14 12:52:52 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 4Pybvn2ZFNz45BZK; Fri, 14 Apr 2023 12:52:53 +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 4Pybvm3lJ4z3rMY; Fri, 14 Apr 2023 12:52:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681476772; 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=n1v02nEoVaL2aKui9V6TGJJpfABAqy8zF9aWJBVK3cs=; b=sXQb5zZIr35eou8EP4FmoxVDl+COf506RELsn5ckashkr0yHzYOs2doJAyRx3uU3wYdNQW 7BCV27FYJlddcrwSBvxbF8UFoJWjARFVAte953uIpfboCne625AUw2OHeCFo4tQEc13ebT 6J9hvtUM0G1OXs6/Nbl0JYnKo+lZ+LiAkHdpvJBQz4CqryhacndhHsrOgvkj0kwr8WZ6O2 jxyvHGcN1EwhWbS/VXN0E88NhGwv1VrjSNhKoWvshuqe6rbWTyNBN4sJHFYlSylSjT5L4Q 2uZhTOLzAHINGKu8DOvQE4QdEBvNDx6y6g9W3FtIF8U8CueID/QhCXnlsBH8EA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681476772; 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=n1v02nEoVaL2aKui9V6TGJJpfABAqy8zF9aWJBVK3cs=; b=E1IBDn0OHg9wQuz8sgiygX0IIdHDNGo8MzhEFUMvvw1T1oSM8pWEjix4D6WCuC9wLlQP+0 lUNg3M7Mhmo/WMpjrMjojPWU0r5JFKRK/KIMQsHWoRi0va/nljA1Wh3rCJ9+SMPas7N43K gMnQWN97PiV9Oc4syyja5Ykl5WuU4JOotsF9xnV8Z1xwrh2MWmW9jysD60tYAMgLdpi/pd KqNbLaCxwoO0cTd2XTnxOLiW+7Vyd9UHWXdG7qPFkY/skofiNd+XVR1QUDJS33tFNkDu/p Z1pqlhvt9dTMcCSeQdKjFT6stJ4MZa1buVR3gCZoVEkpDU66Ceb8+9YT5ifSrg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681476772; a=rsa-sha256; cv=none; b=t6xH6xNePbPKtABt9fO+3XZW35PwgT/gHJ63PA5tSDAaRsGymKr6DxUesQd+qrknmRGKQ3 p2I9t6eib7S4Z77H+kcSA4yW4cYHJ7FwmvcyDdAhkG0NKAYpzcK/LYRSr2VeJO7XzmoEwv YmBDR53AP7yRxbqfbSSQkHuiQKjVSnwhK+9Gv9pzMcabBnoA8To0MXz8g0cR92LLWFPMw8 qgParmhKLNG5TQS+vYcgqwwOpvum91nyqvkOBjUIHvpzd0dbrbS8YgHlEDm6dQTuZUMOh4 Q4K6XqruQKCofSiT1ibCfNfun4pn1srrFkbE4F5XEJSlBmXYd0IUVT2pbmvbYA== 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 4Pybvm2ns0zQHr; Fri, 14 Apr 2023 12:52:52 +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 33ECqqWX074809; Fri, 14 Apr 2023 12:52:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33ECqqD3074808; Fri, 14 Apr 2023 12:52:52 GMT (envelope-from git) Date: Fri, 14 Apr 2023 12:52:52 GMT Message-Id: <202304141252.33ECqqD3074808@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: ac8ec8c7cc42 - stable/13 - makefs: improve some cd9660 error messages 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: ac8ec8c7cc42cdd7288352f2bea08af811857479 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=ac8ec8c7cc42cdd7288352f2bea08af811857479 commit ac8ec8c7cc42cdd7288352f2bea08af811857479 Author: Ed Maste AuthorDate: 2023-03-30 23:36:37 +0000 Commit: Ed Maste CommitDate: 2023-04-14 12:10:37 +0000 makefs: improve some cd9660 error messages Obtained from: OpenBSD Sponsored by: The FreeBSD Foundation (cherry picked from commit c6ed8694ac58c8b81a5e4944cb96c2fa19b6ca79) --- 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; }