From: Karel Zak <kzak@redhat.com>
Date: Thu, 23 Dec 2010 21:59:09 +0000 (+0100)
Subject: libmount: don't export some cache.c files
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d1ce73191c2166e9ea0152179d533d51a13a5df2;p=util-linux

libmount: don't export some cache.c files

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/shlibs/mount/src/cache.c b/shlibs/mount/src/cache.c
index eceb2c0a..0578c065 100644
--- a/shlibs/mount/src/cache.c
+++ b/shlibs/mount/src/cache.c
@@ -177,14 +177,10 @@ static int mnt_cache_add_tag(mnt_cache *cache, const char *token,
 }
 
 
-/**
- * mnt_cache_find_path:
- * @cache: pointer to mnt_cache instance
- * @path: "native" (non-canonicalized) path
- *
- * Returns: cached canonicalized path or NULL.
+/*
+ * Returns cached canonicalized path or NULL.
  */
-const char *mnt_cache_find_path(mnt_cache *cache, const char *path)
+static const char *mnt_cache_find_path(mnt_cache *cache, const char *path)
 {
 	int i;
 
@@ -204,15 +200,10 @@ const char *mnt_cache_find_path(mnt_cache *cache, const char *path)
 	return NULL;
 }
 
-/**
- * mnt_cache_find_tag:
- * @cache: pointer to mnt_cache instance
- * @token: tag name
- * @value: tag value
- *
- * Returns: cached path or NULL.
+/*
+ * Returns cached path or NULL.
  */
-const char *mnt_cache_find_tag(mnt_cache *cache,
+static const char *mnt_cache_find_tag(mnt_cache *cache,
 			const char *token, const char *value)
 {
 	int i;
diff --git a/shlibs/mount/src/mount.h.in b/shlibs/mount/src/mount.h.in
index 76d66aaa..ee56375e 100644
--- a/shlibs/mount/src/mount.h.in
+++ b/shlibs/mount/src/mount.h.in
@@ -135,9 +135,6 @@ extern int mnt_has_regular_mtab(const char **mtab, int *writable);
 /* cache.c */
 extern mnt_cache *mnt_new_cache(void);
 extern void mnt_free_cache(mnt_cache *cache);
-extern const char *mnt_cache_find_path(mnt_cache *cache, const char *path);
-extern const char *mnt_cache_find_tag(mnt_cache *cache,
-                        const char *token, const char *value);
 extern int mnt_cache_read_tags(mnt_cache *cache, const char *devname);
 extern int mnt_cache_device_has_tag(mnt_cache *cache, const char *devname,
                                 const char *token, const char *value);
@@ -145,10 +142,10 @@ extern int mnt_cache_device_has_tag(mnt_cache *cache, const char *devname,
 extern char *mnt_cache_find_tag_value(mnt_cache *cache,
 				const char *devname, const char *token);
 
+extern char *mnt_get_fstype(const char *devname, int *ambi, mnt_cache *cache);
 extern char *mnt_resolve_path(const char *path, mnt_cache *cache);
 extern char *mnt_resolve_tag(const char *token, const char *value, mnt_cache *cache);
 extern char *mnt_resolve_spec(const char *spec, mnt_cache *cache);
-extern char *mnt_get_fstype(const char *devname, int *ambi, mnt_cache *cache);
 
 /* optstr.c */
 extern int mnt_optstr_next_option(char **optstr, char **name, size_t *namesz,
diff --git a/shlibs/mount/src/mount.sym b/shlibs/mount/src/mount.sym
index 3d2475ba..954266d4 100644
--- a/shlibs/mount/src/mount.sym
+++ b/shlibs/mount/src/mount.sym
@@ -6,8 +6,6 @@
 MOUNT_2.19 {
 global:
 	mnt_cache_device_has_tag;
-	mnt_cache_find_path;
-	mnt_cache_find_tag;
 	mnt_cache_find_tag_value;
 	mnt_cache_read_tags;
 	mnt_copy_fs;