blkid: Unexport the private symbol blkid_devdirs

blkid_devdirs was defined in blkidP.h and was never intended to be
used outside of the library.  Since it no longer needs to be shared
across object files, rename it and turn it into a static variable.

Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/libs/blkid/src/blkidP.h b/libs/blkid/src/blkidP.h
index 3c55a5b078b94f5cbda85723e79dfdf07bcf0ef0..159993980a6ad9e0e443fb05e1942d8e6c9e283f 100644 (file)
--- a/libs/blkid/src/blkidP.h
+++ b/libs/blkid/src/blkidP.h
@@ -180,7 +180,6 @@ extern char *blkid_strdup(const char *s);
 extern char *blkid_strndup(const char *s, const int length);
 
 #define BLKID_CACHE_FILE "/etc/blkid.tab"
-extern const char *blkid_devdirs[];
 
 #define BLKID_ERR_IO    5
 #define BLKID_ERR_PROC  9

diff --git a/libs/blkid/src/devno.c b/libs/blkid/src/devno.c
index 9aec187dce7e09ff7d70ad005dc2df96b44a2724..0a16d9be1b6183d2115d1eaf07f39427888e73ef 100644 (file)
--- a/libs/blkid/src/devno.c
+++ b/libs/blkid/src/devno.c
@@ -131,7 +131,7 @@ void blkid__scan_dir(char *dirname, dev_t devno, struct dir_list **list,
 }
 
 /* Directories where we will try to search for device numbers */
-const char *blkid_devdirs[] = { "/devices", "/devfs", "/dev", NULL };
+static const char *devdirs[] = { "/devices", "/devfs", "/dev", NULL };
 
 /*
  * This function finds the pathname to a block device with a given
@@ -148,7 +148,7 @@ char *blkid_devno_to_devname(dev_t devno)
         * Add the starting directories to search in reverse order of
         * importance, since we are using a stack...
         */
-       for (dir = blkid_devdirs; *dir; dir++)
+       for (dir = devdirs; *dir; dir++)
                add_to_dirlist(*dir, &list);
 
        while (list) {