The branch main has been updated by emaste:
URL:
https://cgit.FreeBSD.org/src/commit/?id=c6ed8694ac58c8b81a5e4944cb96c2fa19b6ca79
commit c6ed8694ac58c8b81a5e4944cb96c2fa19b6ca79
Author: Ed Maste <ema...@freebsd.org>
AuthorDate: 2023-03-30 23:36:37 +0000
Commit: Ed Maste <ema...@freebsd.org>
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;
}
