]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
journal: fix some type confusion in journal_directory_vacuum()
authorLennart Poettering <lennart@poettering.net>
Thu, 25 Oct 2018 15:40:41 +0000 (17:40 +0200)
committerLennart Poettering <lennart@poettering.net>
Thu, 25 Oct 2018 19:43:09 +0000 (21:43 +0200)
Let's store array sizes and indexes in size_t. And let's count numbers
of files in uint64_t (simply because that is the type of the input
parameter for this of the function)

src/journal/journal-vacuum.c

index fdf7b8883fa2d3c088ac65606f41b5d71f3125a5..2778ce40c58d71e286eff206710a0648b1770e8c 100644 (file)
@@ -126,11 +126,10 @@ int journal_directory_vacuum(
                 usec_t *oldest_usec,
                 bool verbose) {
 
+        uint64_t sum = 0, freed = 0, n_active_files = 0;
+        size_t n_list = 0, n_allocated = 0, i;
         _cleanup_closedir_ DIR *d = NULL;
         struct vacuum_info *list = NULL;
-        unsigned n_list = 0, i, n_active_files = 0;
-        size_t n_allocated = 0;
-        uint64_t sum = 0, freed = 0;
         usec_t retention_limit = 0;
         char sbytes[FORMAT_BYTES_MAX];
         struct dirent *de;
@@ -283,7 +282,7 @@ int journal_directory_vacuum(
         typesafe_qsort(list, n_list, vacuum_compare);
 
         for (i = 0; i < n_list; i++) {
-                unsigned left;
+                uint64_t left;
 
                 left = n_active_files + n_list - i;