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 /btrfs-map-logical.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 'btrfs-map-logical.c')
| -rw-r--r-- | btrfs-map-logical.c | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/btrfs-map-logical.c b/btrfs-map-logical.c index cad4afc3..57278fe1 100644 --- a/btrfs-map-logical.c +++ b/btrfs-map-logical.c @@ -113,9 +113,10 @@ static int __print_mapping_info(struct btrfs_fs_info *fs_info, u64 logical, ret = btrfs_map_block(fs_info, READ, logical + cur_offset, &cur_len, &multi, mirror_num, NULL); if (ret) { + errno = -ret; fprintf(info_file, - "Error: fails to map mirror%d logical %llu: %s\n", - mirror_num, logical, strerror(-ret)); + "Error: fails to map mirror%d logical %llu: %m\n", + mirror_num, logical); return ret; } for (i = 0; i < multi->num_stripes; i++) { @@ -173,17 +174,18 @@ static int write_extent_content(struct btrfs_fs_info *fs_info, int out_fd, ret = read_extent_data(fs_info, buffer, logical + cur_offset, &cur_len, mirror); if (ret < 0) { + errno = -ret; fprintf(stderr, - "Failed to read extent at [%llu, %llu]: %s\n", - logical, logical + length, strerror(-ret)); + "Failed to read extent at [%llu, %llu]: %m\n", + logical, logical + length); return ret; } ret = write(out_fd, buffer, cur_len); if (ret < 0 || ret != cur_len) { if (ret > 0) ret = -EINTR; - fprintf(stderr, "output file write failed: %s\n", - strerror(-ret)); + errno = -ret; + fprintf(stderr, "output file write failed: %m\n"); return ret; } cur_offset += cur_len; @@ -293,8 +295,9 @@ int main(int argc, char **argv) /* First find the nearest extent */ ret = map_one_extent(root->fs_info, &cur_logical, &cur_len, 0); if (ret < 0) { - fprintf(stderr, "Failed to find extent at [%llu,%llu): %s\n", - cur_logical, cur_logical + cur_len, strerror(-ret)); + errno = -ret; + fprintf(stderr, "Failed to find extent at [%llu,%llu): %m\n", + cur_logical, cur_logical + cur_len); goto out_close_fd; } /* @@ -305,10 +308,10 @@ int main(int argc, char **argv) if (ret > 0) { ret = map_one_extent(root->fs_info, &cur_logical, &cur_len, 1); if (ret < 0) { + errno = -ret; fprintf(stderr, - "Failed to find extent at [%llu,%llu): %s\n", - cur_logical, cur_logical + cur_len, - strerror(-ret)); + "Failed to find extent at [%llu,%llu): %m\n", + cur_logical, cur_logical + cur_len); goto out_close_fd; } if (ret > 0) { |