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

warning: declaration of 'mmap' shadows a global declaration [-Wshadow]

diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
index efa0910780d0fddf878067cb7d1c50e016521525..e0b20ccefd839e3b6613c9082f6bfce173e121e1 100644 (file)
--- 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,
                 bool compress,
                 bool authenticate,
                 JournalMetrics *metrics,

-                MMapCache *mmap,
+                MMapCache *mmap_cache,

                 JournalFile *template,
                 JournalFile **ret) {
 
                 JournalFile *template,
                 JournalFile **ret) {
 


@@ -2142,7 +2142,8 @@ int journal_file_open_reliably(
         size_t l;
         char *p;
 
         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 */
         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);
 
 
         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 aba3d9a9bdd9c80f34461188b63c1a891e02b953..1da1d3b8347829a77f86e747b6e346a0414aeeb4 100644 (file)
--- 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,
                 bool compress,
                 bool authenticate,
                 JournalMetrics *metrics,

-                MMapCache *mmap,
+                MMapCache *mmap_cache,

                 JournalFile *template,
                 JournalFile **ret);
 
                 JournalFile *template,
                 JournalFile **ret);
 


@@ -103,7 +103,7 @@ int journal_file_open_reliably(
                 bool compress,
                 bool authenticate,
                 JournalMetrics *metrics,
                 bool compress,
                 bool authenticate,
                 JournalMetrics *metrics,

-                MMapCache *mmap,
+                MMapCache *mmap_cache,

                 JournalFile *template,
                 JournalFile **ret);
 
                 JournalFile *template,
                 JournalFile **ret);