From 645235106025b53f9ede6ef38971890323b97af2 Mon Sep 17 00:00:00 2001 From: Satoru Takeuchi Date: Tue, 29 Jul 2014 11:18:17 +0900 Subject: btrfs-progs: Unify the messy error message formats Signed-off-by: Satoru Takeuchi Signed-off-by: David Sterba --- cmds-subvolume.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'cmds-subvolume.c') diff --git a/cmds-subvolume.c b/cmds-subvolume.c index 9ab5287..c589284 100644 --- a/cmds-subvolume.c +++ b/cmds-subvolume.c @@ -128,14 +128,14 @@ static int cmd_subvol_create(int argc, char **argv) if (!strcmp(newname, ".") || !strcmp(newname, "..") || strchr(newname, '/') ){ - fprintf(stderr, "ERROR: uncorrect subvolume name ('%s')\n", + fprintf(stderr, "ERROR: incorrect subvolume name '%s'\n", newname); goto out; } len = strlen(newname); if (len == 0 || len >= BTRFS_VOL_NAME_MAX) { - fprintf(stderr, "ERROR: subvolume name too long ('%s)\n", + fprintf(stderr, "ERROR: subvolume name too long '%s'\n", newname); goto out; } @@ -303,7 +303,7 @@ again: if (!strcmp(vname, ".") || !strcmp(vname, "..") || strchr(vname, '/')) { - fprintf(stderr, "ERROR: incorrect subvolume name ('%s')\n", + fprintf(stderr, "ERROR: incorrect subvolume name '%s'\n", vname); ret = 1; goto out; @@ -311,7 +311,7 @@ again: len = strlen(vname); if (len == 0 || len >= BTRFS_VOL_NAME_MAX) { - fprintf(stderr, "ERROR: snapshot name too long ('%s)\n", + fprintf(stderr, "ERROR: snapshot name too long '%s'\n", vname); ret = 1; goto out; @@ -674,14 +674,14 @@ static int cmd_snapshot(int argc, char **argv) if (!strcmp(newname, ".") || !strcmp(newname, "..") || strchr(newname, '/') ){ - fprintf(stderr, "ERROR: incorrect snapshot name ('%s')\n", + fprintf(stderr, "ERROR: incorrect snapshot name '%s'\n", newname); goto out; } len = strlen(newname); if (len == 0 || len >= BTRFS_VOL_NAME_MAX) { - fprintf(stderr, "ERROR: snapshot name too long ('%s)\n", + fprintf(stderr, "ERROR: snapshot name too long '%s'\n", newname); goto out; } @@ -929,7 +929,7 @@ static int cmd_subvol_show(int argc, char **argv) ret = find_mount_root(fullpath, &mnt); if (ret < 0) { - fprintf(stderr, "ERROR: find_mount_root failed on %s: " + fprintf(stderr, "ERROR: find_mount_root failed on '%s': " "%s\n", fullpath, strerror(-ret)); goto out; } -- cgit v1.2.1