From: Satoru Takeuchi <takeuchi_satoru@jp.fujitsu.com>
To: "linux-btrfs@vger.kernel.org" <linux-btrfs@vger.kernel.org>
Subject: [PATCH 1/3] btrfs-progs: prop: convert error messages to use error()
Date: Mon, 9 May 2016 16:20:01 +0900 [thread overview]
Message-ID: <57303A21.9070308@jp.fujitsu.com> (raw)
props.c uses 'fprintf(stderr, "ERROR: ...")' as its error messages,
however we have generic error() function.
Signed-off-by: Satoru Takeuchi <takeuchi_satoru@jp.fujitsu.com>
---
props.c | 21 +++++++++------------
1 file changed, 9 insertions(+), 12 deletions(-)
diff --git a/props.c b/props.c
index 5b74932..5b4e26e 100644
--- a/props.c
+++ b/props.c
@@ -48,7 +48,7 @@ static int prop_read_only(enum prop_object_type type,
fd = open(object, O_RDONLY);
if (fd < 0) {
ret = -errno;
- fprintf(stderr, "ERROR: open %s failed. %s\n",
+ error("open %s failed. %s",
object, strerror(-ret));
goto out;
}
@@ -56,7 +56,7 @@ static int prop_read_only(enum prop_object_type type,
ret = ioctl(fd, BTRFS_IOC_SUBVOL_GETFLAGS, &flags);
if (ret < 0) {
ret = -errno;
- fprintf(stderr, "ERROR: failed to get flags for %s. %s\n",
+ error("failed to get flags for %s. %s",
object, strerror(-ret));
goto out;
}
@@ -76,14 +76,14 @@ static int prop_read_only(enum prop_object_type type,
flags = flags & ~BTRFS_SUBVOL_RDONLY;
} else {
ret = -EINVAL;
- fprintf(stderr, "ERROR: invalid value for property.\n");
+ error("invalid value for property.");
goto out;
}
ret = ioctl(fd, BTRFS_IOC_SUBVOL_SETFLAGS, &flags);
if (ret < 0) {
ret = -errno;
- fprintf(stderr, "ERROR: failed to set flags for %s. %s\n",
+ error("failed to set flags for %s. %s",
object, strerror(-ret));
goto out;
}
@@ -130,8 +130,7 @@ static int prop_compression(enum prop_object_type type,
fd = open_file_or_dir3(object, &dirstream, open_flags);
if (fd == -1) {
ret = -errno;
- fprintf(stderr, "ERROR: open %s failed. %s\n",
- object, strerror(-ret));
+ error("open %s failed. %s", object, strerror(-ret));
goto out;
}
@@ -151,9 +150,8 @@ static int prop_compression(enum prop_object_type type,
if (sret < 0) {
ret = -errno;
if (ret != -ENOATTR)
- fprintf(stderr,
- "ERROR: failed to %s compression for %s. %s\n",
- value ? "set" : "get", object, strerror(-ret));
+ error("failed to %s compression for %s. %s",
+ value ? "set" : "get", object, strerror(-ret));
else
ret = 0;
goto out;
@@ -169,9 +167,8 @@ static int prop_compression(enum prop_object_type type,
sret = fgetxattr(fd, xattr_name, buf, len);
if (sret < 0) {
ret = -errno;
- fprintf(stderr,
- "ERROR: failed to get compression for %s. %s\n",
- object, strerror(-ret));
+ error("failed to get compression for %s. %s",
+ object, strerror(-ret));
goto out;
}
fprintf(stdout, "compression=%.*s\n", (int)len, buf);
--
2.5.5
next reply other threads:[~2016-05-09 7:20 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-09 7:20 Satoru Takeuchi [this message]
2016-05-09 7:49 ` [PATCH 2/3] btrfs-progs: prop: simplify parse_args() Satoru Takeuchi
2016-05-09 7:52 ` [PATCH 3/3] btrfs-progs: prop: remove conditions which never be satisfied Satoru Takeuchi
2016-05-09 15:56 ` [PATCH 1/3] btrfs-progs: prop: convert error messages to use error() David Sterba
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=57303A21.9070308@jp.fujitsu.com \
--to=takeuchi_satoru@jp.fujitsu.com \
--cc=linux-btrfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.