diff options
| author | David Sterba <dsterba@suse.com> | 2018-10-25 14:10:54 +0200 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2018-10-31 18:24:14 +0100 |
| commit | e578b59bf612178d7727c303102049e62676c308 (patch) | |
| tree | a6d6edd7fb6f34f4ce753aa9a1d787198a0e1ddf /cmds-restore.c | |
| parent | d59e19ca0786be2b415ca342b0fab5f222ecb702 (diff) | |
btrfs-progs: convert strerror to implicit %m
Similar to the changes where strerror(errno) was converted, continue
with the remaining cases where the argument was stored in another
variable.
The savings in object size are about 4500 bytes:
$ size btrfs.old btrfs.new
text data bss dec hex filename
805055 24248 19748 849051 cf49b btrfs.old
804527 24248 19748 848523 cf28b btrfs.new
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'cmds-restore.c')
| -rw-r--r-- | cmds-restore.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/cmds-restore.c b/cmds-restore.c index d12c1a92..7a763018 100644 --- a/cmds-restore.c +++ b/cmds-restore.c @@ -1542,8 +1542,8 @@ int cmd_restore(int argc, char **argv) } if ((ret = check_mounted(argv[optind])) < 0) { - fprintf(stderr, "Could not check mount status: %s\n", - strerror(-ret)); + errno = -ret; + fprintf(stderr, "Could not check mount status: %m\n"); return 1; } else if (ret) { fprintf(stderr, "%s is currently mounted. Aborting.\n", argv[optind]); @@ -1591,8 +1591,9 @@ int cmd_restore(int argc, char **argv) key.offset = (u64)-1; root = btrfs_read_fs_root(orig_root->fs_info, &key); if (IS_ERR(root)) { - fprintf(stderr, "fail to read root %llu: %s\n", - root_objectid, strerror(-PTR_ERR(root))); + errno = -PTR_ERR(root); + fprintf(stderr, "fail to read root %llu: %m\n", + root_objectid); root = orig_root; ret = 1; goto out; |