ubi-utils: rename ubi_node_type

Re-name the 'ubi_node_type()' function to a more meaningful name:
'ubi_probe_node()'.

Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>

diff --git a/ubi-utils/include/libubi.h b/ubi-utils/include/libubi.h
index 702e3e19d2b460b8e6afecde5c799706fdac0fea..71a78a37369c60409cacf4199ea18baa1cc6402d 100644 (file)
--- a/ubi-utils/include/libubi.h
+++ b/ubi-utils/include/libubi.h
@@ -289,7 +289,7 @@ int ubi_rnvols(libubi_t desc, const char *node, struct ubi_rnvol_req *rnvol);
 int ubi_rsvol(libubi_t desc, const char *node, int vol_id, long long bytes);
 
 /**
- * ubi_node_type - test UBI node type.
+ * ubi_probe_node - test UBI node.
  * @desc: UBI library descriptor
  * @node: the node to test
  *
@@ -298,7 +298,7 @@ int ubi_rsvol(libubi_t desc, const char *node, int vol_id, long long bytes);
  * this is not an UBI node or if an error occurred (the latter is indicated by
  * a non-zero errno).
  */
-int ubi_node_type(libubi_t desc, const char *node);
+int ubi_probe_node(libubi_t desc, const char *node);
 
 /**
  * ubi_get_dev_info - get UBI device information.

diff --git a/ubi-utils/src/libubi.c b/ubi-utils/src/libubi.c
index 57fd2832647978bf8992ce6213fb1134f48c7538..f456a1d7e6982c67be6f70bbe5ee81318fd72b56 100644 (file)
--- a/ubi-utils/src/libubi.c
+++ b/ubi-utils/src/libubi.c
@@ -740,7 +740,7 @@ out_close:
        return ret;
 }
 
-int ubi_node_type(libubi_t desc, const char *node)
+int ubi_probe_node(libubi_t desc, const char *node)
 {
        struct stat st;
        struct ubi_info info;

diff --git a/ubi-utils/src/ubimkvol.c b/ubi-utils/src/ubimkvol.c
index 820c9d84b56a3fe45883ef90f6c584f27ccc6346..8d6029a66cf79a471b08de163edd7a6965febb1b 100644 (file)
--- a/ubi-utils/src/ubimkvol.c
+++ b/ubi-utils/src/ubimkvol.c
@@ -242,7 +242,7 @@ int main(int argc, char * const argv[])
        if (!libubi)
                return sys_errmsg("cannot open libubi");
 
-       err = ubi_node_type(libubi, args.node);
+       err = ubi_probe_node(libubi, args.node);
        if (err == 2) {
                errmsg("\"%s\" is an UBI volume node, not an UBI device node",
                       args.node);

diff --git a/ubi-utils/src/ubinfo.c b/ubi-utils/src/ubinfo.c
index 62d42b045ef8c0df5e74d2a8b82e4e6bd4d8fd8d..085691fae97635522f5d8c4b16843ea24066590c 100644 (file)
--- a/ubi-utils/src/ubinfo.c
+++ b/ubi-utils/src/ubinfo.c
@@ -140,7 +140,7 @@ static int translate_dev(libubi_t libubi, const char *node)
 {
        int err;
 
-       err = ubi_node_type(libubi, node);
+       err = ubi_probe_node(libubi, node);
        if (err == -1) {
                if (errno)
                        return errmsg("unrecognized device node \"%s\"", node);

diff --git a/ubi-utils/src/ubirename.c b/ubi-utils/src/ubirename.c
index 8f33718caa6878c3313c2f26302da145f8d1a07c..14331b6f715ed318752e0527346e94f8ff83df68 100644 (file)
--- a/ubi-utils/src/ubirename.c
+++ b/ubi-utils/src/ubirename.c
@@ -96,7 +96,7 @@ int main(int argc, char * const argv[])
        if (!libubi)
                return sys_errmsg("cannot open libubi");
 
-       err = ubi_node_type(libubi, node);
+       err = ubi_probe_node(libubi, node);
        if (err == 2) {
                errmsg("\"%s\" is an UBI volume node, not an UBI device node",
                       node);

diff --git a/ubi-utils/src/ubirmvol.c b/ubi-utils/src/ubirmvol.c
index a4cf1dfcf7209e111331e35e7a5e0bc1e2b8f592..edb1b7994261c36863029d1f29604d23e6c3967b 100644 (file)
--- a/ubi-utils/src/ubirmvol.c
+++ b/ubi-utils/src/ubirmvol.c
@@ -184,7 +184,7 @@ int main(int argc, char * const argv[])
        if (libubi == NULL)
                return sys_errmsg("cannot open libubi");
 
-       err = ubi_node_type(libubi, args.node);
+       err = ubi_probe_node(libubi, args.node);
        if (err == 2) {
                errmsg("\"%s\" is an UBI volume node, not an UBI device node",
                       args.node);

diff --git a/ubi-utils/src/ubiupdatevol.c b/ubi-utils/src/ubiupdatevol.c
index c83731c80b473809a161ea0b0dc94793b58824c6..a1e5a300a5748f576bfbfddf6a83d81c6e3086b2 100644 (file)
--- a/ubi-utils/src/ubiupdatevol.c
+++ b/ubi-utils/src/ubiupdatevol.c
@@ -322,7 +322,7 @@ int main(int argc, char * const argv[])
                goto out_libubi;
        }
 
-       err = ubi_node_type(libubi, args.node);
+       err = ubi_probe_node(libubi, args.node);
        if (err == 1) {
                errmsg("\"%s\" is an UBI device node, not an UBI volume node",
                       args.node);