small wording error inline below
----------------------------------------
> Date: Fri, 25 Jul 2014 15:17:05 +0900
> From: [email protected]
> To: [email protected]
> Subject: [PATCH 2/2] btrfs-progs: Unify the messy error message formats
>
> From: Satoru Takeuchi <[email protected]>
>
> - There are many format to show snapshot name in error messages,
> "'%s'", "'%s", "%s", "('%s')", and "('%s)". Since it's messy,
> unify these to "'%s'" format.
> - Fix a type: s/uncorrect/incorrect/
>
> Signed-off-by: Satoru Takeuchi <[email protected]>
>
> ---
> cmds-subvolume.c | 16 ++++++++--------
> 1 file changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/cmds-subvolume.c b/cmds-subvolume.c
> index b7bfb3e..ce38503 100644
> --- a/cmds-subvolume.c
> +++ b/cmds-subvolume.c
> @@ -140,14 +140,14 @@ static int cmd_subvol_create(int argc, char **argv)
> dstdir = dirname(dupdir);
>
> if (!test_issubvolname(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;
> }
> @@ -314,7 +314,7 @@ again:
> free(cpath);
>
> if (!test_issubvolname(vname)) {
> - fprintf(stderr, "ERROR: incorrect subvolume name ('%s')\n",
> + fprintf(stderr, "ERROR: incorrect subvolume name '%s'\n",
> vname);
> ret = 1;
> goto out;
> @@ -322,7 +322,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: too long snapshot name '%s'\n",
+ fprintf(stderr, "ERROR: snapshot name too long '%s'\n",
> vname);
> ret = 1;
> goto out;
> @@ -722,14 +722,14 @@ static int cmd_snapshot(int argc, char **argv)
> }
>
> if (!test_issubvolname(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;
> }
> @@ -778,7 +778,7 @@ static int cmd_snapshot(int argc, char **argv)
> res = ioctl(fddst, BTRFS_IOC_SNAP_CREATE_V2, &args);
>
> if (res < 0) {
> - fprintf( stderr, "ERROR: cannot snapshot %s - %s\n",
> + fprintf( stderr, "ERROR: cannot snapshot '%s' - %s\n",
> subvol_descr, strerror(errno));
> goto out;
> }
> @@ -991,7 +991,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;
> }
> --
> 1.9.3
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
