* [PATCH 2/2] btrfs-progs: Unify the messy error message formats
@ 2014-07-25 6:17 Satoru Takeuchi
2014-07-28 13:24 ` Kyle Gates
0 siblings, 1 reply; 4+ messages in thread
From: Satoru Takeuchi @ 2014-07-25 6:17 UTC (permalink / raw)
To: linux-btrfs
From: Satoru Takeuchi <takeuchi_satoru@jp.fujitsu.com>
- 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 <takeuchi_satoru@jp.fujitsu.com>
---
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",
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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* RE: [PATCH 2/2] btrfs-progs: Unify the messy error message formats
2014-07-25 6:17 [PATCH 2/2] btrfs-progs: Unify the messy error message formats Satoru Takeuchi
@ 2014-07-28 13:24 ` Kyle Gates
2014-07-29 2:18 ` Satoru Takeuchi
0 siblings, 1 reply; 4+ messages in thread
From: Kyle Gates @ 2014-07-28 13:24 UTC (permalink / raw)
To: Satoru Takeuchi, linux-btrfs
small wording error inline below
----------------------------------------
> Date: Fri, 25 Jul 2014 15:17:05 +0900
> From: takeuchi_satoru@jp.fujitsu.com
> To: linux-btrfs@vger.kernel.org
> Subject: [PATCH 2/2] btrfs-progs: Unify the messy error message formats
>
> From: Satoru Takeuchi <takeuchi_satoru@jp.fujitsu.com>
>
> - 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 <takeuchi_satoru@jp.fujitsu.com>
>
> ---
> 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 majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 2/2] btrfs-progs: Unify the messy error message formats
2014-07-28 13:24 ` Kyle Gates
@ 2014-07-29 2:18 ` Satoru Takeuchi
2014-07-29 18:50 ` Kyle Gates
0 siblings, 1 reply; 4+ messages in thread
From: Satoru Takeuchi @ 2014-07-29 2:18 UTC (permalink / raw)
To: Kyle Gates, linux-btrfs
Hi Kyle,
(2014/07/28 22:24), Kyle Gates wrote:
>
> small wording error inline below
>
> ----------------------------------------
>> Date: Fri, 25 Jul 2014 15:17:05 +0900
>> From: takeuchi_satoru@jp.fujitsu.com
>> To: linux-btrfs@vger.kernel.org
>> Subject: [PATCH 2/2] btrfs-progs: Unify the messy error message formats
>>
>> From: Satoru Takeuchi <takeuchi_satoru@jp.fujitsu.com>
>>
>> - 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 <takeuchi_satoru@jp.fujitsu.com>
>>
>> ---
>> 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('%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",
Thank you for your comment. Fixed. How about is it?
===
From 73f9847c603fbe863f072d029b1a4948a1032d6e Mon Sep 17 00:00:00 2001
From: Satoru Takeuchi <takeuchi_satoru@jp.fujitsu.com>
Date: Fri, 25 Jul 2014 12:46:27 +0900
Subject: [PATCH] btrfs-progs: unify the format of error messages.
---
cmds-subvolume.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/cmds-subvolume.c b/cmds-subvolume.c
index b7bfb3e..5a99c94 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: 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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* RE: [PATCH 2/2] btrfs-progs: Unify the messy error message formats
2014-07-29 2:18 ` Satoru Takeuchi
@ 2014-07-29 18:50 ` Kyle Gates
0 siblings, 0 replies; 4+ messages in thread
From: Kyle Gates @ 2014-07-29 18:50 UTC (permalink / raw)
To: Satoru Takeuchi, linux-btrfs
----------------------------------------
> Date: Tue, 29 Jul 2014 11:18:17 +0900
> From: takeuchi_satoru@jp.fujitsu.com
> To: kylegates@hotmail.com; linux-btrfs@vger.kernel.org
> Subject: Re: [PATCH 2/2] btrfs-progs: Unify the messy error message formats
>
> Hi Kyle,
>
> (2014/07/28 22:24), Kyle Gates wrote:
>>
>> small wording error inline below
>>
>> ----------------------------------------
>>> Date: Fri, 25 Jul 2014 15:17:05 +0900
>>> From: takeuchi_satoru@jp.fujitsu.com
>>> To: linux-btrfs@vger.kernel.org
>>> Subject: [PATCH 2/2] btrfs-progs: Unify the messy error message formats
>>>
>>> From: Satoru Takeuchi <takeuchi_satoru@jp.fujitsu.com>
>>>
>>> - 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 <takeuchi_satoru@jp.fujitsu.com>
>>>
>>> ---
>>> 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('%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",
>
> Thank you for your comment. Fixed. How about is it?
Yes, that looks good. Thanks.
>
> ===
> From 73f9847c603fbe863f072d029b1a4948a1032d6e Mon Sep 17 00:00:00 2001
> From: Satoru Takeuchi <takeuchi_satoru@jp.fujitsu.com>
> Date: Fri, 25 Jul 2014 12:46:27 +0900
> Subject: [PATCH] btrfs-progs: unify the format of error messages.
>
> ---
> cmds-subvolume.c | 16 ++++++++--------
> 1 file changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/cmds-subvolume.c b/cmds-subvolume.c
> index b7bfb3e..5a99c94 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: 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
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-07-29 18:50 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-07-25 6:17 [PATCH 2/2] btrfs-progs: Unify the messy error message formats Satoru Takeuchi
2014-07-28 13:24 ` Kyle Gates
2014-07-29 2:18 ` Satoru Takeuchi
2014-07-29 18:50 ` Kyle Gates
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.