From: Michael Tremer Date: Thu, 22 Jul 2021 13:59:03 +0000 (+0000) Subject: package: Change type for package size to size_t X-Git-Tag: 0.9.28~1017 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2711670738d47a544c2eabdaffdc8e22caef6a2c;p=pakfire.git package: Change type for package size to size_t Signed-off-by: Michael Tremer --- diff --git a/src/_pakfire/package.c b/src/_pakfire/package.c index 59fea6c4f..694041840 100644 --- a/src/_pakfire/package.c +++ b/src/_pakfire/package.c @@ -327,7 +327,7 @@ static PyObject* Package_get_installed(PackageObject* self) { } static PyObject* Package_get_downloadsize(PackageObject* self) { - unsigned long long size = pakfire_package_get_downloadsize(self->package); + size_t size = pakfire_package_get_downloadsize(self->package); return PyLong_FromUnsignedLongLong(size); } @@ -339,7 +339,7 @@ static void Package_set_downloadsize(PackageObject* self, PyObject* value) { } static PyObject* Package_get_installsize(PackageObject* self) { - unsigned long long size = pakfire_package_get_installsize(self->package); + size_t size = pakfire_package_get_installsize(self->package); return PyLong_FromUnsignedLongLong(size); } @@ -351,7 +351,7 @@ static void Package_set_installsize(PackageObject* self, PyObject* value) { } static PyObject* Package_get_size(PackageObject* self) { - unsigned long long size = pakfire_package_get_size(self->package); + size_t size = pakfire_package_get_size(self->package); return PyLong_FromUnsignedLongLong(size); } diff --git a/src/libpakfire/include/pakfire/package.h b/src/libpakfire/include/pakfire/package.h index bee1a2016..4133e4e3d 100644 --- a/src/libpakfire/include/pakfire/package.h +++ b/src/libpakfire/include/pakfire/package.h @@ -72,11 +72,11 @@ const char* pakfire_package_get_path(struct pakfire_package* pkg); void pakfire_package_set_path(struct pakfire_package* pkg, const char* path); void pakfire_package_set_filename(struct pakfire_package* pkg, const char* filename); int pakfire_package_is_installed(struct pakfire_package* pkg); -unsigned long long pakfire_package_get_downloadsize(struct pakfire_package* pkg); -void pakfire_package_set_downloadsize(struct pakfire_package* pkg, unsigned long long downloadsize); -unsigned long long pakfire_package_get_installsize(struct pakfire_package* pkg); -void pakfire_package_set_installsize(struct pakfire_package* pkg, unsigned long long installsize); -unsigned long long pakfire_package_get_size(struct pakfire_package* pkg); +size_t pakfire_package_get_downloadsize(struct pakfire_package* pkg); +void pakfire_package_set_downloadsize(struct pakfire_package* pkg, size_t downloadsize); +size_t pakfire_package_get_installsize(struct pakfire_package* pkg); +void pakfire_package_set_installsize(struct pakfire_package* pkg, size_t installsize); +size_t pakfire_package_get_size(struct pakfire_package* pkg); const char* pakfire_package_get_build_host(struct pakfire_package* pkg); void pakfire_package_set_build_host(struct pakfire_package* pkg, const char* build_host); const char* pakfire_package_get_build_id(struct pakfire_package* pkg); diff --git a/src/libpakfire/package.c b/src/libpakfire/package.c index 258751480..add083029 100644 --- a/src/libpakfire/package.c +++ b/src/libpakfire/package.c @@ -560,23 +560,23 @@ PAKFIRE_EXPORT int pakfire_package_is_installed(struct pakfire_package* pkg) { return pool->installed == s->repo; } -PAKFIRE_EXPORT unsigned long long pakfire_package_get_downloadsize(struct pakfire_package* pkg) { +PAKFIRE_EXPORT size_t pakfire_package_get_downloadsize(struct pakfire_package* pkg) { return pakfire_package_get_num(pkg, SOLVABLE_DOWNLOADSIZE); } -PAKFIRE_EXPORT void pakfire_package_set_downloadsize(struct pakfire_package* pkg, unsigned long long downloadsize) { +PAKFIRE_EXPORT void pakfire_package_set_downloadsize(struct pakfire_package* pkg, size_t downloadsize) { return pakfire_package_set_num(pkg, SOLVABLE_DOWNLOADSIZE, downloadsize); } -PAKFIRE_EXPORT unsigned long long pakfire_package_get_installsize(struct pakfire_package* pkg) { +PAKFIRE_EXPORT size_t pakfire_package_get_installsize(struct pakfire_package* pkg) { return pakfire_package_get_num(pkg, SOLVABLE_INSTALLSIZE); } -PAKFIRE_EXPORT void pakfire_package_set_installsize(struct pakfire_package* pkg, unsigned long long installsize) { +PAKFIRE_EXPORT void pakfire_package_set_installsize(struct pakfire_package* pkg, size_t installsize) { return pakfire_package_set_num(pkg, SOLVABLE_INSTALLSIZE, installsize); } -PAKFIRE_EXPORT unsigned long long pakfire_package_get_size(struct pakfire_package* pkg) { +PAKFIRE_EXPORT size_t pakfire_package_get_size(struct pakfire_package* pkg) { if (pakfire_package_is_installed(pkg)) return pakfire_package_get_installsize(pkg); @@ -803,7 +803,7 @@ static void pakfire_package_dump_add_line_date(char** str, const char* key, unsi pakfire_package_dump_add_line(str, key, val); } -static void pakfire_package_dump_add_line_size(char** str, const char* key, unsigned long long size) { +static void pakfire_package_dump_add_line_size(char** str, const char* key, size_t size) { char buffer[128]; pakfire_format_size(buffer, sizeof(buffer) - 1, size); @@ -833,17 +833,17 @@ PAKFIRE_EXPORT char* pakfire_package_dump(struct pakfire_package* pkg, int flags pakfire_package_dump_add_line(&string, _("Arch"), arch); // Size - unsigned long long size = pakfire_package_get_size(pkg); + size_t size = pakfire_package_get_size(pkg); pakfire_package_dump_add_line_size(&string, _("Size"), size); // Installed size if (pakfire_package_is_installed(pkg)) { - unsigned long long installsize = pakfire_package_get_installsize(pkg); + size_t installsize = pakfire_package_get_installsize(pkg); pakfire_package_dump_add_line_size(&string, _("Installed size"), installsize); // Downloadsize } else { - unsigned long long downloadsize = pakfire_package_get_downloadsize(pkg); + size_t downloadsize = pakfire_package_get_downloadsize(pkg); pakfire_package_dump_add_line_size(&string, _("Download size"), downloadsize); }