From e4d974bb63355d1fff92eaae4df5f0cdf3597dc3 Mon Sep 17 00:00:00 2001 From: Artem Bityutskiy Date: Wed, 22 Apr 2009 14:32:08 +0300 Subject: libubi: improve libubi_open interface Remove the not very nice @required parameter, and add a possibility to distinguish between real errors and a situation when UBI is not present. Signed-off-by: Artem Bityutskiy --- ubi-utils/src/libubi.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'ubi-utils/src/libubi.c') diff --git a/ubi-utils/src/libubi.c b/ubi-utils/src/libubi.c index f456a1d..d4b29b9 100644 --- a/ubi-utils/src/libubi.c +++ b/ubi-utils/src/libubi.c @@ -507,7 +507,7 @@ int mtd_num2ubi_dev(libubi_t desc, int mtd_num, int *dev_num) return -1; } -libubi_t libubi_open(int required) +libubi_t libubi_open(void) { int fd, version; struct libubi *lib; @@ -531,9 +531,7 @@ libubi_t libubi_open(int required) /* Make sure UBI is present */ fd = open(lib->sysfs_ubi, O_RDONLY); if (fd == -1) { - if (required) - errmsg("cannot open \"%s\", UBI does not seem to " - "exist in system", lib->sysfs_ubi); + errno = 0; goto out_error; } @@ -945,6 +943,7 @@ int ubi_rnvols(libubi_t desc, const char *node, struct ubi_rnvol_req *rnvol) { int fd, ret; + desc = desc; fd = open(node, O_RDONLY); if (fd == -1) return -1; -- cgit v1.2.3