vitalif
/
e2fsprogs
mirror of https://github.com/vitalif/e2fsprogs
1
0
Fork 0
Code Issues Releases Wiki Activity

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>
bitmap-optimize
Theodore Ts'o 2008-08-27 00:00:44 -04:00
parent 7515a74478
commit 0bb740621f
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/libblkid1.symbols vendored
View File

@ -7,7 +7,7 @@ libblkid.so.1 libblkid1 #MINVER#
blkid_dev_iterate_end@Base 1.37-2sarge1
blkid_dev_next@Base 1.37-2sarge1
blkid_dev_set_search@Base 1.38-1
blkid_devdirs@Base 1.37-2sarge1
#MISSING: 1.41.1-1# blkid_devdirs@Base 1.37-2sarge1
blkid_devno_to_devname@Base 1.37-2sarge1
blkid_find_dev_with_tag@Base 1.37-2sarge1
blkid_find_tag_dev@Base 1.37-2sarge1

1
lib/blkid/blkidP.h
View File

@ -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

4
lib/blkid/devno.c
View File

@ -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) {