RepoMirrors/btrfs-progs
1
0
Fork 0
mirror of https://github.com/kdave/btrfs-progs synced 2025-02-17 18:26:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

btrfs-progs: prop: convert error messages to use error()

Browse Source 
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>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Satoru Takeuchi 2016-05-09 16:20:01 +09:00 committed by David Sterba
parent 21dc9050b5
commit ece1cef709
1 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
props.c
View File

@ -48,16 +48,15 @@ static int prop_read_only(enum prop_object_type type,
fd = open(object, O_RDONLY); fd = open(object, O_RDONLY);
if (fd < 0) { if (fd < 0) {
ret = -errno; ret = -errno;
fprintf(stderr, "ERROR: open %s failed. %s\n", error("failed to open %s: %s", object, strerror(-ret));
object, strerror(-ret));
goto out; goto out;
} }
ret = ioctl(fd, BTRFS_IOC_SUBVOL_GETFLAGS, &flags); ret = ioctl(fd, BTRFS_IOC_SUBVOL_GETFLAGS, &flags);
if (ret < 0) { if (ret < 0) {
ret = -errno; ret = -errno;
fprintf(stderr, "ERROR: failed to get flags for %s. %s\n", error("failed to get flags for %s: %s", object,
object, strerror(-ret)); strerror(-ret));
goto out; goto out;
} }
@ -76,15 +75,15 @@ static int prop_read_only(enum prop_object_type type,
flags = flags & ~BTRFS_SUBVOL_RDONLY; flags = flags & ~BTRFS_SUBVOL_RDONLY;
} else { } else {
ret = -EINVAL; ret = -EINVAL;
fprintf(stderr, "ERROR: invalid value for property.\n"); error("invalid value for property: %s", value);
goto out; goto out;
} }
ret = ioctl(fd, BTRFS_IOC_SUBVOL_SETFLAGS, &flags); ret = ioctl(fd, BTRFS_IOC_SUBVOL_SETFLAGS, &flags);
if (ret < 0) { if (ret < 0) {
ret = -errno; ret = -errno;
fprintf(stderr, "ERROR: failed to set flags for %s. %s\n", error("failed to set flags for %s: %s", object,
object, strerror(-ret)); strerror(-ret));
goto out; goto out;
} }
@ -130,8 +129,7 @@ static int prop_compression(enum prop_object_type type,
fd = open_file_or_dir3(object, &dirstream, open_flags); fd = open_file_or_dir3(object, &dirstream, open_flags);
if (fd == -1) { if (fd == -1) {
ret = -errno; ret = -errno;
fprintf(stderr, "ERROR: open %s failed. %s\n", error("failed to open %s: %s", object, strerror(-ret));
object, strerror(-ret));
goto out; goto out;
} }
@ -151,8 +149,7 @@ static int prop_compression(enum prop_object_type type,
if (sret < 0) { if (sret < 0) {
ret = -errno; ret = -errno;
if (ret != -ENOATTR) if (ret != -ENOATTR)
fprintf(stderr, error("failed to %s compression for %s: %s",
"ERROR: failed to %s compression for %s. %s\n",
value ? "set" : "get", object, strerror(-ret)); value ? "set" : "get", object, strerror(-ret));
else else
ret = 0; ret = 0;
@ -169,8 +166,7 @@ static int prop_compression(enum prop_object_type type,
sret = fgetxattr(fd, xattr_name, buf, len); sret = fgetxattr(fd, xattr_name, buf, len);
if (sret < 0) { if (sret < 0) {
ret = -errno; ret = -errno;
fprintf(stderr, error("failed to get compression for %s: %s",
"ERROR: failed to get compression for %s. %s\n",
object, strerror(-ret)); object, strerror(-ret));
goto out; goto out;
} }