shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-26 10:03:40 +03:00
Code

journal: rename 'mmap' to 'mmap_cache' to appease gcc

Browse Source 
warning: declaration of 'mmap' shadows a global declaration [-Wshadow]
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2012-08-16 19:30:36 +02:00
parent 1137e6c73b
commit 2737027897
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/journal/journal-file.c
View File

@ -2134,7 +2134,7 @@ int journal_file_open_reliably(
bool compress,
bool authenticate,
JournalMetrics *metrics,
MMapCache *mmap,
MMapCache *mmap_cache,
JournalFile *template,
JournalFile **ret) {
@ -2142,7 +2142,8 @@ int journal_file_open_reliably(
size_t l;
char *p;
r = journal_file_open(fname, flags, mode, compress, authenticate, metrics, mmap, template, ret);
r = journal_file_open(fname, flags, mode, compress, authenticate,
metrics, mmap_cache, template, ret);
if (r != -EBADMSG && /* corrupted */
r != -ENODATA && /* truncated */
r != -EHOSTDOWN && /* other machine */
@ -2176,7 +2177,8 @@ int journal_file_open_reliably(
log_warning("File %s corrupted or uncleanly shut down, renaming and replacing.", fname);
return journal_file_open(fname, flags, mode, compress, authenticate, metrics, mmap, template, ret);
return journal_file_open(fname, flags, mode, compress, authenticate,
metrics, mmap_cache, template, ret);
}

4
src/journal/journal-file.h
View File

@ -90,7 +90,7 @@ int journal_file_open(
bool compress,
bool authenticate,
JournalMetrics *metrics,
MMapCache *mmap,
MMapCache *mmap_cache,
JournalFile *template,
JournalFile **ret);
@ -103,7 +103,7 @@ int journal_file_open_reliably(
bool compress,
bool authenticate,
JournalMetrics *metrics,
MMapCache *mmap,
MMapCache *mmap_cache,
JournalFile *template,
JournalFile **ret);