diff options
author | Karel Zak <kzak@redhat.com> | 2009-04-29 15:11:54 +0200 |
---|---|---|
committer | Karel Zak <kzak@redhat.com> | 2009-04-29 15:11:54 +0200 |
commit | cee95a956734d3dbe0d544000b545b8e5af3e627 (patch) | |
tree | 195b494fbeaeaa4a2a38cd8ca522d9808082b154 /libs | |
parent | 5d5ae40b26af1a9e399264b43ca59c6e193c4244 (diff) | |
download | util-linux-old-cee95a956734d3dbe0d544000b545b8e5af3e627.tar.gz |
blkid: rename blkid_evaluate_spec to blkid_evaluate_tag
"SPEC" is usually used in mount(8) as a generic term for device name or
tag (LABEL, UUID). The function blkid_evaluate_* works with TAGs only.
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'libs')
-rw-r--r-- | libs/blkid/TODO | 2 | ||||
-rw-r--r-- | libs/blkid/bin/blkid.c | 2 | ||||
-rw-r--r-- | libs/blkid/bin/findfs.c | 2 | ||||
-rw-r--r-- | libs/blkid/src/blkid.h | 2 | ||||
-rw-r--r-- | libs/blkid/src/blkid.sym | 2 | ||||
-rw-r--r-- | libs/blkid/src/evaluate.c | 6 |
6 files changed, 8 insertions, 8 deletions
diff --git a/libs/blkid/TODO b/libs/blkid/TODO index f29c0019..1d0a67ee 100644 --- a/libs/blkid/TODO +++ b/libs/blkid/TODO @@ -39,7 +39,7 @@ - use fstatat() in blkid__scan_dir() - - add evaluate.c: blkid_evaluate_spec_to_buffer() (and add lib/canonicalize.c: + - add evaluate.c: blkid_evaluate_tag_to_buffer() (and add lib/canonicalize.c: canonicalize_path_to_buffer()) - add values: diff --git a/libs/blkid/bin/blkid.c b/libs/blkid/bin/blkid.c index 72b22c3d..528e4a22 100644 --- a/libs/blkid/bin/blkid.c +++ b/libs/blkid/bin/blkid.c @@ -567,7 +567,7 @@ int main(int argc, char **argv) /* * Evaluate API */ - char *res = blkid_evaluate_spec(search_type, search_value, NULL); + char *res = blkid_evaluate_tag(search_type, search_value, NULL); if (res) { err = 0; printf("%s\n", res); diff --git a/libs/blkid/bin/findfs.c b/libs/blkid/bin/findfs.c index e316eb24..18608b47 100644 --- a/libs/blkid/bin/findfs.c +++ b/libs/blkid/bin/findfs.c @@ -50,7 +50,7 @@ int main(int argc, char **argv) } else usage(2); - dev = blkid_evaluate_spec(tk, vl, NULL); + dev = blkid_evaluate_tag(tk, vl, NULL); if (!dev) errx(EXIT_FAILURE, _("unable to resolve '%s'"), argv[1]); diff --git a/libs/blkid/src/blkid.h b/libs/blkid/src/blkid.h index ea5b3eb3..43b2b552 100644 --- a/libs/blkid/src/blkid.h +++ b/libs/blkid/src/blkid.h @@ -117,7 +117,7 @@ extern int blkid_safe_string(const char *str, char *str_safe, size_t len); /* evaluate.c */ extern int blkid_send_uevent(const char *devname, const char *action); -extern char *blkid_evaluate_spec(const char *token, const char *value, +extern char *blkid_evaluate_tag(const char *token, const char *value, blkid_cache *cache); /* probe.c */ diff --git a/libs/blkid/src/blkid.sym b/libs/blkid/src/blkid.sym index abb8e51f..562f44d0 100644 --- a/libs/blkid/src/blkid.sym +++ b/libs/blkid/src/blkid.sym @@ -46,7 +46,7 @@ global: blkid_do_probe; blkid_do_safeprobe; blkid_encode_string; - blkid_evaluate_spec; + blkid_evaluate_tag; blkid_free_probe; blkid_new_probe; blkid_probe_all; diff --git a/libs/blkid/src/evaluate.c b/libs/blkid/src/evaluate.c index 85591b71..a9c9fbab 100644 --- a/libs/blkid/src/evaluate.c +++ b/libs/blkid/src/evaluate.c @@ -185,14 +185,14 @@ static char *evaluate_by_scan(const char *token, const char *value, } /** - * blkid_evaluate_spec: + * blkid_evaluate_tag: * @token: token name (e.g "LABEL" or "UUID") * @value: token data * @cache: pointer to cache (or NULL when you don't want to re-use the cache) * * Returns allocated string with device name. */ -char *blkid_evaluate_spec(const char *token, const char *value, blkid_cache *cache) +char *blkid_evaluate_tag(const char *token, const char *value, blkid_cache *cache) { struct blkid_config *conf = NULL; char *t = NULL, *v = NULL; @@ -256,7 +256,7 @@ int main(int argc, char *argv[]) blkid_init_debug(0); - res = blkid_evaluate_spec(argv[1], argv[2], &cache); + res = blkid_evaluate_tag(argv[1], argv[2], &cache); if (res) printf("%s\n", res); if (cache) |