diff mbox

[1/2] libubi: make `ubi_dev_present()' a library function

Message ID 1327563110-23966-1-git-send-email-computersforpeace@gmail.com
State Accepted
Commit 780ebf0db71429b508ac64b3133f8e4901f64733
Headers show

Commit Message

Brian Norris Jan. 26, 2012, 7:31 a.m. UTC 
We will use this function in ubinfo.

Signed-off-by: Brian Norris <computersforpeace@gmail.com>
---
 ubi-utils/include/libubi.h |    9 +++++++++
 ubi-utils/libubi.c         |   12 +++---------
 2 files changed, 12 insertions(+), 9 deletions(-)

Comments

Artem Bityutskiy Jan. 27, 2012, 2:51 p.m. UTC | #1 
On Wed, 2012-01-25 at 23:31 -0800, Brian Norris wrote:
> We will use this function in ubinfo.
> 
> Signed-off-by: Brian Norris <computersforpeace@gmail.com>

Many thanks Brian for the fixes, pushed to mtd-utils.git!
diff mbox

Patch

diff --git a/ubi-utils/include/libubi.h b/ubi-utils/include/libubi.h
index 02017e8..dc03d02 100644
--- a/ubi-utils/include/libubi.h
+++ b/ubi-utils/include/libubi.h
@@ -346,6 +346,15 @@  int ubi_get_dev_info(libubi_t desc, const char *node,
 		     struct ubi_dev_info *info);
 
 /**
+ * ubi_dev_present - check whether an UBI device is present.
+ * @desc: UBI library descriptor
+ * @dev_num: UBI device number to check
+ *
+ * This function returns %1 if UBI device is present and %0 if not.
+ */
+int ubi_dev_present(libubi_t desc, int dev_num);
+
+/**
  * ubi_get_dev_info1 - get UBI device information.
  * @desc: UBI library descriptor
  * @dev_num: UBI device number to fetch information about
diff --git a/ubi-utils/libubi.c b/ubi-utils/libubi.c
index 4d5f316..c898e36 100644
--- a/ubi-utils/libubi.c
+++ b/ubi-utils/libubi.c
@@ -1121,16 +1121,10 @@  int ubi_leb_change_start(libubi_t desc, int fd, int lnum, int bytes, int dtype)
 	return 0;
 }
 
-/**
- * dev_present - check whether an UBI device is present.
- * @lib: libubi descriptor
- * @dev_num: UBI device number to check
- *
- * This function returns %1 if UBI device is present and %0 if not.
- */
-static int dev_present(struct libubi *lib, int dev_num)
+int ubi_dev_present(libubi_t desc, int dev_num)
 {
 	struct stat st;
+	struct libubi *lib = (struct libubi *)desc;
 	char file[strlen(lib->ubi_dev) + 50];
 
 	sprintf(file, lib->ubi_dev, dev_num);
@@ -1146,7 +1140,7 @@  int ubi_get_dev_info1(libubi_t desc, int dev_num, struct ubi_dev_info *info)
 	memset(info, 0, sizeof(struct ubi_dev_info));
 	info->dev_num = dev_num;
 
-	if (!dev_present(lib, dev_num))
+	if (!ubi_dev_present(desc, dev_num))
 		return -1;
 
 	sysfs_ubi = opendir(lib->sysfs_ubi);