aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArtem Bityutskiy <Artem.Bityutskiy@nokia.com>2009-04-20 16:23:22 +0300
committerArtem Bityutskiy <Artem.Bityutskiy@nokia.com>2009-04-20 16:24:36 +0300
commitb03c80c7d84e14ab1a28311db4bc7eb08948c569 (patch)
treedbb7788255c1686bb10c92a9c0bc050540ad8530
parent0c2ff6f5a5d6cd1449c4f77240fc9e27e4782307 (diff)
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>
-rw-r--r--ubi-utils/include/libubi.h4
-rw-r--r--ubi-utils/src/libubi.c2
-rw-r--r--ubi-utils/src/ubimkvol.c2
-rw-r--r--ubi-utils/src/ubinfo.c2
-rw-r--r--ubi-utils/src/ubirename.c2
-rw-r--r--ubi-utils/src/ubirmvol.c2
-rw-r--r--ubi-utils/src/ubiupdatevol.c2
7 files changed, 8 insertions, 8 deletions
diff --git a/ubi-utils/include/libubi.h b/ubi-utils/include/libubi.h
index 702e3e1..71a78a3 100644
--- 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 57fd283..f456a1d 100644
--- 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 820c9d8..8d6029a 100644
--- 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 62d42b0..085691f 100644
--- 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 8f33718..14331b6 100644
--- 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 a4cf1df..edb1b79 100644
--- 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 c83731c..a1e5a30 100644
--- 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);