From b03c80c7d84e14ab1a28311db4bc7eb08948c569 Mon Sep 17 00:00:00 2001 From: Artem Bityutskiy Date: Mon, 20 Apr 2009 16:23:22 +0300 Subject: 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 --- ubi-utils/include/libubi.h | 4 ++-- ubi-utils/src/libubi.c | 2 +- ubi-utils/src/ubimkvol.c | 2 +- ubi-utils/src/ubinfo.c | 2 +- ubi-utils/src/ubirename.c | 2 +- ubi-utils/src/ubirmvol.c | 2 +- ubi-utils/src/ubiupdatevol.c | 2 +- 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); -- cgit v1.2.3