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/ubirsvol.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'ubi-utils/ubirsvol.c') diff --git a/ubi-utils/ubirsvol.c b/ubi-utils/ubirsvol.c index c469060..69a4ea1 100644 --- a/ubi-utils/ubirsvol.c +++ b/ubi-utils/ubirsvol.c @@ -33,7 +33,6 @@ #include #include "common.h" -#include "ubiutils-common.h" /* The variables below are set by command line arguments */ struct args { @@ -114,7 +113,7 @@ static int parse_opt(int argc, char * const argv[]) switch (key) { 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; -- cgit v1.2.3