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/ubimkvol.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/ubimkvol.c')
| -rw-r--r-- | ubi-utils/ubimkvol.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/ubi-utils/ubimkvol.c b/ubi-utils/ubimkvol.c index 7c2a234..fdbc67f 100644 --- a/ubi-utils/ubimkvol.c +++ b/ubi-utils/ubimkvol.c @@ -33,7 +33,6 @@ #include <libubi.h> #include "common.h" -#include "ubiutils-common.h" /* The variables below are set by command line arguments */ struct args { @@ -137,7 +136,7 @@ static int parse_opt(int argc, char * const argv[]) break; case 's': - args.bytes = ubiutils_get_bytes(optarg); + args.bytes = util_get_bytes(optarg); if (args.bytes <= 0) return errmsg("bad volume size: \"%s\"", optarg); break; @@ -278,9 +277,9 @@ int main(int argc, char * const argv[]) } printf("Volume ID %d, size %d LEBs (", vol_info.vol_id, vol_info.rsvd_lebs); - ubiutils_print_bytes(vol_info.rsvd_bytes, 0); + util_print_bytes(vol_info.rsvd_bytes, 0); printf("), LEB size "); - ubiutils_print_bytes(vol_info.leb_size, 1); + util_print_bytes(vol_info.leb_size, 1); printf(", %s, name \"%s\", alignment %d\n", req.vol_type == UBI_DYNAMIC_VOLUME ? "dynamic" : "static", vol_info.name, vol_info.alignment); |