diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2008-08-27 00:00:44 -0400 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2008-08-27 00:00:44 -0400 |
| commit | 0bb740621f33f54161416684b9003e93f11d2779 (patch) | |
| tree | 71a9935c321d3e22cfd817b8f72ecadb8a680d87 /lib | |
| parent | 7515a7447836708241b2b30ca7d70d1257265e75 (diff) | |
| download | android_external_e2fsprogs-0bb740621f33f54161416684b9003e93f11d2779.tar.gz android_external_e2fsprogs-0bb740621f33f54161416684b9003e93f11d2779.tar.bz2 android_external_e2fsprogs-0bb740621f33f54161416684b9003e93f11d2779.zip | |
libblkid: 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>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/blkid/blkidP.h | 1 | ||||
| -rw-r--r-- | lib/blkid/devno.c | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/lib/blkid/blkidP.h b/lib/blkid/blkidP.h index 9d1e459c..e0f11a07 100644 --- a/lib/blkid/blkidP.h +++ b/lib/blkid/blkidP.h @@ -105,7 +105,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/lib/blkid/devno.c b/lib/blkid/devno.c index 1962c8d4..e9c174f4 100644 --- a/lib/blkid/devno.c +++ b/lib/blkid/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) { |