From 9f58a14bf6c2f5ff7fbdae92a9cdaa44db7091ce Mon Sep 17 00:00:00 2001 From: Michael Schroeder Date: Mon, 22 Oct 2018 11:13:46 +0200 Subject: [PATCH] Incompatible ABI change: change diskusage from int to long long The diskusage is in kilobytes anyway, but this should make things more future proof. --- examples/solv/solv.c | 2 +- src/diskusage.c | 2 +- src/pool.h | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/solv/solv.c b/examples/solv/solv.c index 6a5dab73..d43497ab 100644 --- 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 b764b98b..2b716fe4 100644 --- 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 7b147432..457d4155 100644 --- 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; -- 2.47.2