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-fi-usage.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-fi-usage.c')
| -rw-r--r-- | cmds-fi-usage.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/cmds-fi-usage.c b/cmds-fi-usage.c index 0b0e47fe..de7ad668 100644 --- a/cmds-fi-usage.c +++ b/cmds-fi-usage.c @@ -164,8 +164,7 @@ static int load_chunk_info(int fd, struct chunk_info **info_ptr, int *info_count return -e; if (ret < 0) { - error("cannot look up chunk tree info: %s", - strerror(e)); + error("cannot look up chunk tree info: %m"); return 1; } /* the ioctl returns the number of item it found in nr_items */ @@ -244,8 +243,7 @@ static struct btrfs_ioctl_space_args *load_space_info(int fd, char *path) ret = ioctl(fd, BTRFS_IOC_SPACE_INFO, sargs); if (ret < 0) { - error("cannot get space info on '%s': %s", path, - strerror(errno)); + error("cannot get space info on '%s': %m", path); free(sargs); return NULL; } @@ -270,8 +268,8 @@ static struct btrfs_ioctl_space_args *load_space_info(int fd, char *path) ret = ioctl(fd, BTRFS_IOC_SPACE_INFO, sargs); if (ret < 0) { - error("cannot get space info with %u slots: %s", - count, strerror(errno)); + error("cannot get space info with %u slots: %m", + count); free(sargs); return NULL; } @@ -356,8 +354,7 @@ static int print_filesystem_usage_overall(int fd, struct chunk_info *chunkinfo, } if (r_total_size == 0) { - error("cannot get space info on '%s': %s", - path, strerror(errno)); + error("cannot get space info on '%s': %m", path); ret = 1; goto exit; @@ -554,8 +551,7 @@ static int load_device_info(int fd, struct device_info **device_info_ptr, if (ret < 0) { if (errno == EPERM) return -errno; - error("cannot get filesystem info: %s", - strerror(errno)); + error("cannot get filesystem info: %m"); return 1; } |