summaryrefslogtreecommitdiff
path: root/src/journal
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2012-08-16 19:30:36 +0200
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2012-08-16 19:44:51 +0200
commit27370278976735ea365c5169e8916b5eec6e6bdc (patch)
tree9c138fb51fa620694f1bef425ac858fb60ac8eac /src/journal
parent1137e6c73ba4456f6bb054a2a45f80972f568586 (diff)
journal: rename 'mmap' to 'mmap_cache' to appease gcc
warning: declaration of 'mmap' shadows a global declaration [-Wshadow]
Diffstat (limited to 'src/journal')
-rw-r--r--src/journal/journal-file.c8
-rw-r--r--src/journal/journal-file.h4
2 files changed, 7 insertions, 5 deletions
diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
index efa0910780..e0b20ccefd 100644
--- a/src/journal/journal-file.c
+++ b/src/journal/journal-file.c
@@ -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);
}
diff --git a/src/journal/journal-file.h b/src/journal/journal-file.h
index aba3d9a9bd..1da1d3b834 100644
--- a/src/journal/journal-file.h
+++ b/src/journal/journal-file.h
@@ -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);