From 8fde67b27cdf6c0f84b2e997aeed6510282f17f5 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Mon, 18 Sep 2023 13:23:42 +0000 Subject: [PATCH] package: Treat sizes as unsigned long long It looks like there have been some more casting issues which should hopefully be fixed now. Signed-off-by: Michael Tremer --- src/_pakfire/package.c | 8 ++++---- src/libpakfire/package.c | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/_pakfire/package.c b/src/_pakfire/package.c index 99c5e3ed4..cf369f2f7 100644 --- a/src/_pakfire/package.c +++ b/src/_pakfire/package.c @@ -340,25 +340,25 @@ static void Package_set_filename(PackageObject* self, PyObject* value) { } static PyObject* Package_get_downloadsize(PackageObject* self) { - size_t size = pakfire_package_get_num(self->package, PAKFIRE_PKG_DOWNLOADSIZE, 0); + unsigned long long size = pakfire_package_get_num(self->package, PAKFIRE_PKG_DOWNLOADSIZE, 0); return PyLong_FromUnsignedLongLong(size); } static void Package_set_downloadsize(PackageObject* self, PyObject* value) { - unsigned long downloadsize = PyLong_AsUnsignedLong(value); + unsigned long long downloadsize = PyLong_AsUnsignedLong(value); pakfire_package_set_num(self->package, PAKFIRE_PKG_DOWNLOADSIZE, downloadsize); } static PyObject* Package_get_installsize(PackageObject* self) { - size_t size = pakfire_package_get_num(self->package, PAKFIRE_PKG_INSTALLSIZE, 0); + unsigned long long size = pakfire_package_get_num(self->package, PAKFIRE_PKG_INSTALLSIZE, 0); return PyLong_FromUnsignedLongLong(size); } static void Package_set_installsize(PackageObject* self, PyObject* value) { - unsigned long installsize = PyLong_AsUnsignedLong(value); + unsigned long long installsize = PyLong_AsUnsignedLong(value); pakfire_package_set_num(self->package, PAKFIRE_PKG_INSTALLSIZE, installsize); } diff --git a/src/libpakfire/package.c b/src/libpakfire/package.c index 23f9b3257..d2281c351 100644 --- a/src/libpakfire/package.c +++ b/src/libpakfire/package.c @@ -1563,7 +1563,7 @@ PAKFIRE_EXPORT char* pakfire_package_dump(struct pakfire_package* pkg, int flags // Installed Size if (pakfire_package_is_installed(pkg)) { - size_t installsize = pakfire_package_get_num(pkg, PAKFIRE_PKG_INSTALLSIZE, 0); + unsigned long long installsize = pakfire_package_get_num(pkg, PAKFIRE_PKG_INSTALLSIZE, 0); if (installsize) pakfire_package_dump_add_line_size(&string, _("Installed Size"), installsize); @@ -2434,9 +2434,9 @@ struct json_object* pakfire_package_to_json(struct pakfire_package* pkg) { } // Installed package size - size_t installsize = pakfire_package_get_num(pkg, PAKFIRE_PKG_INSTALLSIZE, 0); + unsigned long long installsize = pakfire_package_get_num(pkg, PAKFIRE_PKG_INSTALLSIZE, 0); - r = pakfire_json_add_integer(pkg->pakfire, md, "size", installsize); + r = pakfire_json_add_integer(pkg->pakfire, md, "size", (uint64_t)installsize); if (r) goto ERROR; -- 2.47.2