diff options
| author | Rosen Penev <rosenp@gmail.com> | 2018-01-07 13:54:21 -0800 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2018-01-31 15:14:03 +0100 |
| commit | e4df433b8a2d5ef944ab4764a5ad237bcdbd1fdc (patch) | |
| tree | 19aa758dee389cea7c86c68ce1c8cc8e9a52836c /cmds-balance.c | |
| parent | 24103f42ad7a65457a62ae5c0190ea0e428cb14b (diff) | |
btrfs-progs: treewide: Replace strerror(errno) with %m.
As btrfs is specific to Linux, %m can be used instead of strerror(errno)
in format strings. This has some size reduction benefits for embedded
systems.
glibc, musl, and uclibc-ng all support %m as a modifier to printf.
A quick glance at the BIONIC libc source indicates that it has
support for %m as well. BSDs and Windows do not but I do believe
them to be beyond the scope of btrfs-progs.
Compiled sizes on Ubuntu 16.04:
Before:
3916512 btrfs
233688 libbtrfs.so.0.1
4899 bcp
2367672 btrfs-convert
2208488 btrfs-corrupt-block
13302 btrfs-debugfs
2152160 btrfs-debug-tree
2136024 btrfs-find-root
2287592 btrfs-image
2144600 btrfs-map-logical
2130760 btrfs-select-super
2152608 btrfstune
2131760 btrfs-zero-log
2277752 mkfs.btrfs
9166 show-blocks
After:
3908744 btrfs
233256 libbtrfs.so.0.1
4899 bcp
2366560 btrfs-convert
2207432 btrfs-corrupt-block
13302 btrfs-debugfs
2151104 btrfs-debug-tree
2134968 btrfs-find-root
2281864 btrfs-image
2143536 btrfs-map-logical
2129704 btrfs-select-super
2151552 btrfstune
2130696 btrfs-zero-log
2276272 mkfs.btrfs
9166 show-blocks
Total savings: 23928 (24 kilo)bytes
Signed-off-by: Rosen Penev <rosenp@gmail.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'cmds-balance.c')
| -rw-r--r-- | cmds-balance.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/cmds-balance.c b/cmds-balance.c index 3cc0f62d..0c91bdf1 100644 --- a/cmds-balance.c +++ b/cmds-balance.c @@ -475,8 +475,7 @@ static int do_balance(const char *path, struct btrfs_ioctl_balance_args *args, fprintf(stderr, "balance canceled by user\n"); ret = 0; } else { - error("error during balancing '%s': %s", path, - strerror(errno)); + error("error during balancing '%s': %m", path); if (errno != EINPROGRESS) fprintf(stderr, "There may be more info in syslog - try dmesg | tail\n"); @@ -794,9 +793,9 @@ static int cmd_balance_resume(int argc, char **argv) else ret = 1; } else { - error("error during balancing '%s': %s\n" + error("error during balancing '%s': %m\n" "There may be more info in syslog - try dmesg | tail", - path, strerror(errno)); + path); ret = 1; } } else { @@ -868,7 +867,7 @@ static int cmd_balance_status(int argc, char **argv) ret = 0; goto out; } - error("balance status on '%s' failed: %s", path, strerror(errno)); + error("balance status on '%s' failed: %m", path); ret = 2; goto out; } |