From f4ec4511d0729802e783b1757d6bcd556737510e Mon Sep 17 00:00:00 2001 From: David Oberhollenzer Date: Thu, 1 Sep 2016 15:27:38 +0200 Subject: 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 --- ubi-utils/ubiattach.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'ubi-utils/ubiattach.c') diff --git a/ubi-utils/ubiattach.c b/ubi-utils/ubiattach.c index a7c62d0..09f85af 100644 --- a/ubi-utils/ubiattach.c +++ b/ubi-utils/ubiattach.c @@ -31,7 +31,6 @@ #include #include "common.h" -#include "ubiutils-common.h" #define DEFAULT_CTRL_DEV "/dev/ubi_ctrl" @@ -238,11 +237,11 @@ int main(int argc, char * const argv[]) } printf("UBI device number %d, total %d LEBs (", dev_info.dev_num, dev_info.total_lebs); - ubiutils_print_bytes(dev_info.total_bytes, 0); + util_print_bytes(dev_info.total_bytes, 0); printf("), available %d LEBs (", dev_info.avail_lebs); - ubiutils_print_bytes(dev_info.avail_bytes, 0); + util_print_bytes(dev_info.avail_bytes, 0); printf("), LEB size "); - ubiutils_print_bytes(dev_info.leb_size, 1); + util_print_bytes(dev_info.leb_size, 1); printf("\n"); libubi_close(libubi); -- cgit v1.2.3