tequilaOS/platform_external_selinux
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

libselinux: avoid shadowing 'stat' in load_mmap

Browse source 
label_file.c: In function ‘load_mmap’:
   label_file.c:238:81: error: declaration of ‘stat’ shadows a global declaration [-Werror=shadow]
   cc1: all warnings being treated as errors

Signed-off-by: Joe MacDonald <joe@deserted.net>
This commit is contained in:
Joe MacDonald 2013-10-21 15:16:40 -04:00 committed by Stephen Smalley
parent 2864f757dd
commit fceca652c1
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libselinux/src/label_file.c
View file

@ -235,7 +235,7 @@ static int process_line(struct selabel_handle *rec,
return 0;
}
static int load_mmap(struct selabel_handle *rec, const char *path, struct stat *stat)
static int load_mmap(struct selabel_handle *rec, const char *path, struct stat *sb)
{
struct saved_data *data = (struct saved_data *)rec->data;
char mmap_path[PATH_MAX + 1];
@ -266,13 +266,13 @@ static int load_mmap(struct selabel_handle *rec, const char *path, struct stat *
}
/* if mmap is old, ignore it */
if (mmap_stat.st_mtime < stat->st_mtime) {
if (mmap_stat.st_mtime < sb->st_mtime) {
close(mmapfd);
return -1;
}
if (mmap_stat.st_mtime == stat->st_mtime &&
mmap_stat.st_mtim.tv_nsec < stat->st_mtim.tv_nsec) {
if (mmap_stat.st_mtime == sb->st_mtime &&
mmap_stat.st_mtim.tv_nsec < sb->st_mtim.tv_nsec) {
close(mmapfd);
return -1;
}