mirror/openwrt
1
0
Fork 1
mirror of https://git.openwrt.org/openwrt/openwrt.git synced 2026-02-20 21:42:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

apk-tools: fix compilation warning from downstream full print patch
Some checks failed
Build all core packages / Build all core packages for selected target (push) Waiting to run
Details
Build and Push prebuilt tools container / Build and Push all prebuilt containers (push) Has been cancelled
Details
Build host tools / Build host tools for linux and macos based systems (push) Has been cancelled
Details

Browse source 
Fix trivial compilation warning caused by downstream full print patch.

../src/app_list.c: In function 'print_full':
../src/app_list.c:85:35: warning: format '%zu' expects argument of type 'size_t', but argument 2 has type 'uint64_t' {aka 'long long unsigned int'} [-Wformat=]
   85 |         printf("Installed-Size: %zu\n", pkg->installed_size);
      |                                 ~~^     ~~~~~~~~~~~~~~~~~~~
      |                                   |        |
      |                                   |        uint64_t {aka long long unsigned int}
      |                                   unsigned int
      |                                 %llu
../src/app_list.c:86:25: warning: format '%zu' expects argument of type 'size_t', but argument 2 has type 'uint64_t' {aka 'long long unsigned int'} [-Wformat=]
   86 |         printf("Size: %zu\n", pkg->size);
      |                       ~~^     ~~~~~~~~~
      |                         |        |
      |                         |        uint64_t {aka long long unsigned int}
      |                         unsigned int
      |                       %llu
../src/app_list.c:58:31: warning: unused variable 'd' [-Wunused-variable]
   58 |         struct apk_dependency d;

Remove unused variable and use PRIu64 to handle uint64_t type.

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
This commit is contained in:
Christian Marangi 2025-10-14 17:15:07 +02:00
parent 0b116e9d73
commit e408030cec
No known key found for this signature in database
GPG key ID: AC001D09ADBFEAD7
2 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package/system/apk/patches/0001-openwrt-move-layer-db-to-temp-folder.patch
View file

@ -10,7 +10,7 @@ Signed-off-by: Paul Spooren <mail@aparcar.org>
--- a/src/database.c
+++ b/src/database.c
@@ -1832,7 +1832,7 @@ const char *apk_db_layer_name(int layer)
@@ -1856,7 +1856,7 @@ const char *apk_db_layer_name(int layer)
{
switch (layer) {
case APK_DB_LAYER_ROOT: return "lib/apk/db";

14
package/system/apk/patches/0010-app_list-add-full-print.patch
View file

@ -12,7 +12,7 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
--- a/src/app_list.c
+++ b/src/app_list.c
@@ -49,12 +49,53 @@ struct list_ctx {
@@ -49,12 +49,51 @@ struct list_ctx {
unsigned int match_providers : 1;
unsigned int match_depends : 1;
unsigned int manifest : 1;
@ -22,8 +22,6 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
+static void print_full(const struct apk_package *pkg, const struct list_ctx *ctx)
+{
+ struct apk_dependency d;
+
+ printf("Package: %s\n", pkg->name->name);
+ printf("Version: " BLOB_FMT "\n", BLOB_PRINTF(*pkg->version));
+ if (apk_array_len(pkg->depends)) {
@ -49,8 +47,8 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
+ if (pkg->description)
+ printf("Description: " BLOB_FMT "\n", BLOB_PRINTF(*pkg->description));
+ printf("License: " BLOB_FMT "\n", BLOB_PRINTF(*pkg->license));
+ printf("Installed-Size: %zu\n", pkg->installed_size);
+ printf("Size: %zu\n", pkg->size);
+ printf("Installed-Size: %" PRIu64 "\n", pkg->installed_size);
+ printf("Size: %" PRIu64 "\n", pkg->size);
+ printf("\n");
+}
+
@ -66,7 +64,7 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
if (ctx->manifest) {
printf("%s " BLOB_FMT "\n", pkg->name->name, BLOB_PRINTF(*pkg->version));
return;
@@ -96,6 +137,7 @@ static void print_package(const struct apk_database *db, const struct apk_name *
@@ -96,6 +135,7 @@ static void print_package(const struct a
OPT(OPT_LIST_depends, APK_OPT_SH("d") "depends") \
OPT(OPT_LIST_installed, APK_OPT_SH("I")) \
OPT(OPT_LIST_manifest, "manifest") \
@ -74,7 +72,7 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
OPT(OPT_LIST_origin, APK_OPT_SH("o") "origin") \
OPT(OPT_LIST_orphaned, APK_OPT_SH("O")) \
OPT(OPT_LIST_providers, APK_OPT_SH("P") "providers") \
@@ -109,6 +151,9 @@ static int list_parse_option(void *pctx, struct apk_ctx *ac, int opt, const char
@@ -109,6 +149,9 @@ static int list_parse_option(void *pctx,
struct apk_query_spec *qs = &ac->query;
switch (opt) {
@ -84,7 +82,7 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
case OPT_LIST_available:
qs->filter.available = 1;
break;
@@ -117,6 +162,7 @@ static int list_parse_option(void *pctx, struct apk_ctx *ac, int opt, const char
@@ -117,6 +160,7 @@ static int list_parse_option(void *pctx,
break;
case OPT_LIST_installed:
installed: