diff options
author | David Sterba <dsterba@suse.cz> | 2014-04-28 18:04:48 +0200 |
---|---|---|
committer | David Sterba <dsterba@suse.cz> | 2014-10-10 18:26:35 +0200 |
commit | 6f23efdf27e70964c5a2228b5cea1c20b269846d (patch) | |
tree | fea6d5cc96fcc99dd2db79e29bcffaa30d9d2f04 /utils.h | |
parent | db5d44d132492988cd59d0dddce9ef9260da35fe (diff) | |
download | btrfs-progs-6f23efdf27e70964c5a2228b5cea1c20b269846d.tar.gz |
btrfs-progs: extend pretty printers with unit mode
The functionality of pretty unit printing was duplicated by
df_pretty_sizes, merge it with pretty_size and enhance the interface
with more suffix mode. Raw, binary or decimal.
Signed-off-by: David Sterba <dsterba@suse.cz>
Diffstat (limited to 'utils.h')
-rw-r--r-- | utils.h | 21 |
1 files changed, 15 insertions, 6 deletions
@@ -47,6 +47,14 @@ int check_argc_max(int nargs, int expected); void fixup_argv0(char **argv, const char *token); void set_argv0(char **argv); +/* + * Output mode of byte units + */ +#define UNITS_RAW (1) +#define UNITS_BINARY (2) +#define UNITS_DECIMAL (3) +#define UNITS_HUMAN UNITS_BINARY + int make_btrfs(int fd, const char *device, const char *label, char *fs_uuid, u64 blocks[6], u64 num_bytes, u32 nodesize, u32 leafsize, u32 sectorsize, u32 stripesize, u64 features); @@ -68,12 +76,13 @@ int check_mounted_where(int fd, const char *file, char *where, int size, int btrfs_device_already_in_root(struct btrfs_root *root, int fd, int super_offset); -int pretty_size_snprintf(u64 size, char *str, size_t str_bytes); -#define pretty_size(size) \ - ({ \ - static __thread char _str[24]; \ - (void)pretty_size_snprintf((size), _str, sizeof(_str)); \ - _str; \ +int pretty_size_snprintf(u64 size, char *str, size_t str_bytes, int unit_mode); +#define pretty_size(size) pretty_size_mode(size, UNITS_BINARY) +#define pretty_size_mode(size, mode) \ + ({ \ + static __thread char _str[32]; \ + (void)pretty_size_snprintf((size), _str, sizeof(_str), mode); \ + _str; \ }) int get_mountpt(char *dev, char *mntpt, size_t size); |