git: ac8ec8c7cc42 - stable/13 - makefs: improve some cd9660 error messages
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 14 Apr 2023 12:52:52 UTC
The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=ac8ec8c7cc42cdd7288352f2bea08af811857479 commit ac8ec8c7cc42cdd7288352f2bea08af811857479 Author: Ed Maste <emaste@FreeBSD.org> AuthorDate: 2023-03-30 23:36:37 +0000 Commit: Ed Maste <emaste@FreeBSD.org> 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; }