Incompatible ABI change: change diskusage from int to long long

The diskusage is in kilobytes anyway, but this should make things
more future proof.

diff --git a/examples/solv/solv.c b/examples/solv/solv.c
index 6a5dab7360614e61aee241bc35fbaae4f76951fd..d43497ab7dc6e1fe3c4c5afb058066764657068f 100644 (file)
--- a/examples/solv/solv.c
+++ b/examples/solv/solv.c
@@ -130,7 +130,7 @@ showdiskusagechanges(Transaction *trans)
   duc[3].path = "/etc";
   transaction_calc_duchanges(trans, duc, 4);
   for (i = 0; i < 4; i++)
-    printf("duchanges %s: %d K  %d inodes\n", duc[i].path, duc[i].kbytes, duc[i].files);
+    printf("duchanges %s: %lld K  %lld inodes\n", duc[i].path, duc[i].kbytes, duc[i].files);
 }
 #endif
 

diff --git a/src/diskusage.c b/src/diskusage.c
index b764b98b160de5988b73db190925d2b0bc4a8d52..2b716fe4dfc5768777c3ff1585aeb270a52f4ac6 100644 (file)
--- a/src/diskusage.c
+++ b/src/diskusage.c
@@ -308,7 +308,7 @@ pool_calc_duchanges(Pool *pool, Map *installedmap, DUChanges *mps, int nmps)
        {
          if (MAPTST(installedmap, sp))
            continue;
-         if (ignoredu.map && MAPTST(&ignoredu, sp - oldinstalled->start))
+         if (ignoredu.size && MAPTST(&ignoredu, sp - oldinstalled->start))
            continue;
          repo_search(oldinstalled, sp, SOLVABLE_DISKUSAGE, 0, 0, solver_fill_DU_cb, &cbd);
        }

diff --git a/src/pool.h b/src/pool.h
index 7b1474327f0411177ea2b143aee14f58fedfbe1a..457d415591e2e7c7bcb075dec96bdcad9f711746 100644 (file)
--- a/src/pool.h
+++ b/src/pool.h
@@ -376,8 +376,8 @@ const char *pool_lookup_deltalocation(Pool *pool, Id entry, unsigned int *median
 
 typedef struct _DUChanges {
   const char *path;
-  int kbytes;
-  int files;
+  long long kbytes;
+  long long files;
   int flags;
 } DUChanges;