summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSatoru Takeuchi <takeuchi_satoru@jp.fujitsu.com>2014-07-29 11:18:17 +0900
committerDavid Sterba <dsterba@suse.cz>2014-08-22 15:07:03 +0200
commit645235106025b53f9ede6ef38971890323b97af2 (patch)
treede6a77c7a524e6858a19b162607b07722347c69a
parent5374ebe0427d28cc2d161cade9ee7f03e24aee52 (diff)
btrfs-progs: Unify the messy error message formats
Signed-off-by: Satoru Takeuchi <takeuchi_satoru@jp.fujitsu.com> Signed-off-by: David Sterba <dsterba@suse.cz>
-rw-r--r--cmds-subvolume.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/cmds-subvolume.c b/cmds-subvolume.c
index 9ab5287b..c5892847 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;
}