From ebb01c9421a8007a34b69eb972aab45369446b23 Mon Sep 17 00:00:00 2001 From: Steve Guminski Date: Wed, 12 Jul 2017 10:46:33 -0400 Subject: [PATCH] LU-5170 lfs: Standardize error messages in macros Error messages in ARG2INT() and ARG2ULL() are updated to a standard format. Messages are prefixed with the name of the utility and the command that caused the error. User-provided values are delimited with single quotes. Test-Parameters: trivial Signed-off-by: Steve Guminski Change-Id: I31a0a30ac15681826e7e25b8a44d56174fb23e08 Reviewed-on: https://review.whamcloud.com/28250 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Andreas Dilger Reviewed-by: John L. Hammond --- lustre/utils/lfs.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/lustre/utils/lfs.c b/lustre/utils/lfs.c index ac201eb..dac8589 100644 --- a/lustre/utils/lfs.c +++ b/lustre/utils/lfs.c @@ -3570,12 +3570,13 @@ static int lfs_check(int argc, char **argv) #ifdef HAVE_SYS_QUOTA_H #define ARG2INT(nr, str, msg) \ do { \ - char *endp; \ - nr = strtol(str, &endp, 0); \ - if (*endp) { \ - fprintf(stderr, "error: bad %s: %s\n", msg, str); \ - return CMD_HELP; \ - } \ + char *endp; \ + nr = strtol(str, &endp, 0); \ + if (*endp != '\0') { \ + fprintf(stderr, "%s: bad %s '%s'\n", \ + progname, msg, str); \ + return CMD_HELP; \ + } \ } while (0) #define ADD_OVERFLOW(a,b) ((a + b) < a) ? (a = ULONG_MAX) : (a = a + b) @@ -3644,7 +3645,8 @@ do { \ \ rc = llapi_parse_size(str, &limit, &units, 1); \ if (rc < 0) { \ - fprintf(stderr, "error: bad limit value %s\n", str); \ + fprintf(stderr, "%s: bad limit '%s'\n", \ + progname, str); \ return CMD_HELP; \ } \ nr = limit; \ -- 1.8.3.1