diff options
| author | David Oberhollenzer <david.oberhollenzer@sigma-star.at> | 2016-09-01 15:27:38 +0200 |
|---|---|---|
| committer | David Oberhollenzer <david.oberhollenzer@sigma-star.at> | 2016-11-17 11:36:56 +0100 |
| commit | f4ec4511d0729802e783b1757d6bcd556737510e (patch) | |
| tree | de44ef5941b606e5ad5ac86ee4eba37013c8c863 /ubi-utils/ubinfo.c | |
| parent | dbb13d2f0eba1770a96cac537218e7625556e172 (diff) | |
Merge rest of ubiutils-common into libmtd common
This patch moves the remaining 3 functions from ubiutils-common.{c,h}
into libmtd common.{c,h}.
The functions are only generic utility functions that other mtd-utils
programs may also find usefull and every program that uses libubi links
against libmtd anyway so there is no real reason for keeping around a
seperate ubiutils-common with only generic helper functions.
Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
Diffstat (limited to 'ubi-utils/ubinfo.c')
| -rw-r--r-- | ubi-utils/ubinfo.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/ubi-utils/ubinfo.c b/ubi-utils/ubinfo.c index cb88f53..82d4f18 100644 --- a/ubi-utils/ubinfo.c +++ b/ubi-utils/ubinfo.c @@ -31,7 +31,6 @@ #include <libubi.h> #include "common.h" -#include "ubiutils-common.h" /* The variables below are set by command line arguments */ struct args { @@ -211,12 +210,12 @@ static int print_vol_info(libubi_t libubi, int dev_num, int vol_id) printf("Alignment: %d\n", vol_info.alignment); printf("Size: %d LEBs (", vol_info.rsvd_lebs); - ubiutils_print_bytes(vol_info.rsvd_bytes, 0); + util_print_bytes(vol_info.rsvd_bytes, 0); printf(")\n"); if (vol_info.type == UBI_STATIC_VOLUME) { printf("Data bytes: "); - ubiutils_print_bytes(vol_info.data_bytes, 1); + util_print_bytes(vol_info.data_bytes, 1); printf("\n"); } printf("State: %s\n", vol_info.corrupted ? "corrupted" : "OK"); @@ -240,15 +239,15 @@ static int print_dev_info(libubi_t libubi, int dev_num, int all) printf("ubi%d\n", dev_info.dev_num); printf("Volumes count: %d\n", dev_info.vol_count); printf("Logical eraseblock size: "); - ubiutils_print_bytes(dev_info.leb_size, 0); + util_print_bytes(dev_info.leb_size, 0); printf("\n"); printf("Total amount of logical eraseblocks: %d (", dev_info.total_lebs); - ubiutils_print_bytes(dev_info.total_bytes, 0); + util_print_bytes(dev_info.total_bytes, 0); printf(")\n"); printf("Amount of available logical eraseblocks: %d (", dev_info.avail_lebs); - ubiutils_print_bytes(dev_info.avail_bytes, 0); + util_print_bytes(dev_info.avail_bytes, 0); printf(")\n"); printf("Maximum count of volumes %d\n", dev_info.max_vol_count); |