From: Michael Tremer Date: Wed, 4 Oct 2023 17:07:30 +0000 (+0000) Subject: Fix any incorrect format arguments throughout the code base X-Git-Tag: 0.9.30~1548 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a8a410646f87cd95fba88263570b91360f5445ad;p=pakfire.git Fix any incorrect format arguments throughout the code base Signed-off-by: Michael Tremer --- diff --git a/src/cli/lib/dump.c b/src/cli/lib/dump.c index cf3e5f693..762d9d523 100644 --- a/src/cli/lib/dump.c +++ b/src/cli/lib/dump.c @@ -61,7 +61,6 @@ int cli_dump_packagelist(struct pakfire_packagelist* list, int flags) { int cli_dump_repolist(struct pakfire_repolist* list, int flags) { struct pakfire_repo* repo = NULL; - const char* fmt = " %-20s %8s %12d %12d \n"; int r; if (!list) @@ -79,7 +78,7 @@ int cli_dump_repolist(struct pakfire_repolist* list, int flags) { if (!repo) break; - r = printf(fmt, + r = printf(" %-20s %8s %12d %12d \n", pakfire_repo_get_name(repo), pakfire_repo_get_enabled(repo) ? "Yes" : "No", pakfire_repo_get_priority(repo), diff --git a/src/cli/lib/progressbar.c b/src/cli/lib/progressbar.c index 709707c6d..e20ba10a5 100644 --- a/src/cli/lib/progressbar.c +++ b/src/cli/lib/progressbar.c @@ -412,7 +412,7 @@ static const char* cli_progressbar_elapsed_time(struct cli_progressbar* p, return NULL; // Format the time - r = asprintf(&widget->buffer, "%02lu:%02lu", t / 60, t % 60); + r = asprintf(&widget->buffer, "%02ld:%02ld", t / 60, t % 60); if (r) return NULL; @@ -442,7 +442,7 @@ static const char* cli_progressbar_eta(struct cli_progressbar* p, // Otherwise show the ETA } else { - r = asprintf(&widget->buffer, "%-5s: %02lu:%02lu", _("ETA"), t / 60, t % 60); + r = asprintf(&widget->buffer, "%-5s: %02ld:%02ld", _("ETA"), t / 60, t % 60); if (r < 0) return NULL; } diff --git a/src/cli/lib/terminal.c b/src/cli/lib/terminal.c index 90e49648c..45b78c35e 100644 --- a/src/cli/lib/terminal.c +++ b/src/cli/lib/terminal.c @@ -211,7 +211,7 @@ static int cli_term_print_problem(struct pakfire_problem* problem, unsigned int* (*num_solutions)++; // Show the solution - printf(" [%d] %s\n", *num_solutions, pakfire_solution_to_string(*s)); + printf(" [%u] %s\n", *num_solutions, pakfire_solution_to_string(*s)); } } diff --git a/src/libpakfire/archive.c b/src/libpakfire/archive.c index 8ef50e948..80a6a36f3 100644 --- a/src/libpakfire/archive.c +++ b/src/libpakfire/archive.c @@ -290,11 +290,11 @@ static int pakfire_archive_parse_format(struct pakfire_archive* archive, // Break on anything else default: ERROR(archive->pakfire, "This version of Pakfire does not support " - "archive format %d\n", archive->format); + "archive format %u\n", archive->format); return -ENOTSUP; } - DEBUG(archive->pakfire, "Archive format is %d\n", archive->format); + DEBUG(archive->pakfire, "Archive format is %u\n", archive->format); return 0; } @@ -739,7 +739,7 @@ int pakfire_archive_copy(struct pakfire_archive* archive, const char* path) { // Copy everything ssize_t bytes_written = sendfile(fileno(f), fileno(archive->f), NULL, size); if (bytes_written < size) { - ERROR(archive->pakfire, "Could not copy archive (%zu byte(s) written): %m\n", + ERROR(archive->pakfire, "Could not copy archive (%zd byte(s) written): %m\n", bytes_written); goto ERROR; } diff --git a/src/libpakfire/build.c b/src/libpakfire/build.c index b53c1a043..a69c60aa8 100644 --- a/src/libpakfire/build.c +++ b/src/libpakfire/build.c @@ -397,7 +397,7 @@ static int pakfire_build_send_filelist(struct pakfire* pakfire, void* data, int // Fetch the next file file = pakfire_filelist_get(ctx->filelist, ctx->i); if (!file) { - DEBUG(pakfire, "Could not fetch file %d: %m\n", ctx->i); + DEBUG(pakfire, "Could not fetch file %u: %m\n", ctx->i); r = 1; goto ERROR; } @@ -1006,7 +1006,7 @@ static int pakfire_build_packages(struct pakfire_build* build, for (char** package = packages; *package; package++) num_packages++; - DEBUG(build->pakfire, "Found %d package(s)\n", num_packages); + DEBUG(build->pakfire, "Found %u package(s)\n", num_packages); // Build packages in reverse order for (int i = num_packages - 1; i >= 0; i--) { diff --git a/src/libpakfire/cgroup.c b/src/libpakfire/cgroup.c index 032a9ee43..b3f7584d3 100644 --- a/src/libpakfire/cgroup.c +++ b/src/libpakfire/cgroup.c @@ -115,7 +115,7 @@ static int pakfire_cgroup_set_root(struct pakfire_cgroup* cgroup) { // unprivileged users default: r = pakfire_string_format(cgroup->root, - "/sys/fs/cgroup/user.slice/user-%d.slice/user@%d.service", uid, uid); + "/sys/fs/cgroup/user.slice/user-%u.slice/user@%u.service", uid, uid); break; } @@ -934,7 +934,7 @@ static int __pakfire_cgroup_parse_cpu_stats(struct pakfire_cgroup* cgroup, } } - DEBUG(cgroup->pakfire, "Unknown key for CPU stats: %s = %ld\n", key, val); + DEBUG(cgroup->pakfire, "Unknown key for CPU stats: %s = %lu\n", key, val); return 0; } @@ -1000,7 +1000,7 @@ static int __pakfire_cgroup_parse_memory_stats(struct pakfire_cgroup* cgroup, } // Log any unknown keys - DEBUG(cgroup->pakfire, "Unknown key for memory stats: %s = %ld\n", key, val); + DEBUG(cgroup->pakfire, "Unknown key for memory stats: %s = %lu\n", key, val); return 0; } diff --git a/src/libpakfire/downloader.c b/src/libpakfire/downloader.c index ec6229868..a8a13a9b5 100644 --- a/src/libpakfire/downloader.c +++ b/src/libpakfire/downloader.c @@ -1185,7 +1185,7 @@ int pakfire_downloader_run(struct pakfire_downloader* downloader, const char* ti break; default: - ERROR(downloader->pakfire, "Received unhandled cURL message %d\n", msg->msg); + ERROR(downloader->pakfire, "Received unhandled cURL message %u\n", msg->msg); break; } } diff --git a/src/libpakfire/file.c b/src/libpakfire/file.c index 993e7229c..475223f56 100644 --- a/src/libpakfire/file.c +++ b/src/libpakfire/file.c @@ -167,7 +167,7 @@ static int pakfire_file_read_fcaps(struct pakfire_file* file, if (cap_permitted) { r = cap_set_flag(file->caps, CAP_PERMITTED, 1, caps, CAP_SET); if (r) { - ERROR(file->pakfire, "Could not set capability %d: %m\n", cap); + ERROR(file->pakfire, "Could not set capability %u: %m\n", cap); goto ERROR; } } @@ -175,7 +175,7 @@ static int pakfire_file_read_fcaps(struct pakfire_file* file, if (cap_inheritable) { r = cap_set_flag(file->caps, CAP_INHERITABLE, 1, caps, CAP_SET); if (r) { - ERROR(file->pakfire, "Could not set capability %d: %m\n", cap); + ERROR(file->pakfire, "Could not set capability %u: %m\n", cap); goto ERROR; } } @@ -183,7 +183,7 @@ static int pakfire_file_read_fcaps(struct pakfire_file* file, if (cap_effective) { r = cap_set_flag(file->caps, CAP_EFFECTIVE, 1, caps, CAP_SET); if (r) { - ERROR(file->pakfire, "Could not set capability %d: %m\n", cap); + ERROR(file->pakfire, "Could not set capability %u: %m\n", cap); goto ERROR; } } @@ -230,21 +230,21 @@ int pakfire_file_write_fcaps(struct pakfire_file* file, struct vfs_cap_data* cap // Fetch CAP_PERMITTED r = cap_get_flag(file->caps, cap, CAP_PERMITTED, &cap_permitted); if (r) { - ERROR(file->pakfire, "Could not fetch capability %d: %m\n", cap); + ERROR(file->pakfire, "Could not fetch capability %u: %m\n", cap); goto ERROR; } // Fetch CAP_INHERITABLE r = cap_get_flag(file->caps, cap, CAP_INHERITABLE, &cap_inheritable); if (r) { - ERROR(file->pakfire, "Could not fetch capability %d: %m\n", cap); + ERROR(file->pakfire, "Could not fetch capability %u: %m\n", cap); goto ERROR; } // Fetch CAP_EFFECTIVE r = cap_get_flag(file->caps, cap, CAP_EFFECTIVE, &cap_effective); if (r) { - ERROR(file->pakfire, "Could not fetch capability %d: %m\n", cap); + ERROR(file->pakfire, "Could not fetch capability %u: %m\n", cap); goto ERROR; } @@ -1639,7 +1639,7 @@ static int pakfire_file_verify_size(struct pakfire_file* file, const struct stat // Size differs file->verify_status |= PAKFIRE_FILE_SIZE_CHANGED; - DEBUG(file->pakfire, "%s: Filesize differs (expected %zu, got %zu byte(s))\n", + DEBUG(file->pakfire, "%s: Filesize differs (expected %zd, got %zd byte(s))\n", pakfire_file_get_path(file), size, st->st_size); return 0; diff --git a/src/libpakfire/jail.c b/src/libpakfire/jail.c index 62c31a746..7b861d929 100644 --- a/src/libpakfire/jail.c +++ b/src/libpakfire/jail.c @@ -481,7 +481,7 @@ PAKFIRE_EXPORT int pakfire_jail_set_timeout( jail->timeout.it_value.tv_sec = timeout; if (timeout > 0) - DEBUG(jail->pakfire, "Timeout set to %d second(s)\n", timeout); + DEBUG(jail->pakfire, "Timeout set to %u second(s)\n", timeout); else DEBUG(jail->pakfire, "Timeout disabled\n"); @@ -899,7 +899,7 @@ static int pakfire_jail_wait(struct pakfire_jail* jail, struct pakfire_jail_exec goto ERROR; } - DEBUG(jail->pakfire, "Received signal %d\n", siginfo.ssi_signo); + DEBUG(jail->pakfire, "Received signal %u\n", siginfo.ssi_signo); // Handle signals switch (siginfo.ssi_signo) { @@ -913,7 +913,7 @@ static int pakfire_jail_wait(struct pakfire_jail* jail, struct pakfire_jail_exec break; default: - ERROR(jail->pakfire, "Received unhandled signal %d\n", + ERROR(jail->pakfire, "Received unhandled signal %u\n", siginfo.ssi_signo); break; } @@ -1679,8 +1679,8 @@ static int pakfire_jail_child(struct pakfire_jail* jail, struct pakfire_jail_exe uid_t euid = geteuid(); gid_t egid = getegid(); - DEBUG(jail->pakfire, " UID: %d (effective %d)\n", uid, euid); - DEBUG(jail->pakfire, " GID: %d (effective %d)\n", gid, egid); + DEBUG(jail->pakfire, " UID: %u (effective %u)\n", uid, euid); + DEBUG(jail->pakfire, " GID: %u (effective %u)\n", gid, egid); // Check if we are (effectively running as root) if (uid || gid || euid || egid) { @@ -1814,7 +1814,7 @@ static int pakfire_jail_child(struct pakfire_jail* jail, struct pakfire_jail_exe // Log argv for (unsigned int i = 0; argv[i]; i++) - DEBUG(jail->pakfire, " argv[%d] = %s\n", i, argv[i]); + DEBUG(jail->pakfire, " argv[%u] = %s\n", i, argv[i]); // exec() command r = execvpe(argv[0], (char**)argv, jail->env); diff --git a/src/libpakfire/key.c b/src/libpakfire/key.c index 20c12d422..99b5a3a0e 100644 --- a/src/libpakfire/key.c +++ b/src/libpakfire/key.c @@ -118,7 +118,7 @@ static int pakfire_key_create(struct pakfire_key** key, struct pakfire* pakfire, break; default: - ERROR(pakfire, "Unsupported key algorithm %d\n", algo); + ERROR(pakfire, "Unsupported key algorithm %u\n", algo); errno = ENOTSUP; goto ERROR; } @@ -206,7 +206,7 @@ PAKFIRE_EXPORT int pakfire_key_generate(struct pakfire_key** key, struct pakfire break; default: - ERROR(pakfire, "Invalid key algorithm %d\n", algo); + ERROR(pakfire, "Invalid key algorithm %u\n", algo); errno = EINVAL; return 1; } diff --git a/src/libpakfire/pakfire.c b/src/libpakfire/pakfire.c index 8cd7bbbb6..cd2614f86 100644 --- a/src/libpakfire/pakfire.c +++ b/src/libpakfire/pakfire.c @@ -228,7 +228,7 @@ static unsigned int pakfire_unmap_id(struct pakfire* pakfire, // Check if the ID is in range if (unmapped_id < 0) { - ERROR(pakfire, "Mapped ID is out of range. Setting to %d\n", subid->id); + ERROR(pakfire, "Mapped ID is out of range. Setting to %u\n", subid->id); unmapped_id = subid->id; } @@ -989,14 +989,14 @@ PAKFIRE_EXPORT int pakfire_create(struct pakfire** pakfire, const char* path, goto ERROR; DEBUG(p, "Pakfire initialized at %p\n", p); - DEBUG(p, " user = %s (%d)\n", p->user.name, p->user.uid); - DEBUG(p, " group = %s (%d)\n", p->group.name, p->group.gid); + DEBUG(p, " user = %s (%u)\n", p->user.name, p->user.uid); + DEBUG(p, " group = %s (%u)\n", p->group.name, p->group.gid); DEBUG(p, " arch = %s (%s)\n", pakfire_get_arch(p), pakfire_get_effective_arch(p)); DEBUG(p, " path = %s\n", pakfire_get_path(p)); if (p->user.subuids.id) - DEBUG(p, " subuid = %d (%zu)\n", p->user.subuids.id, p->user.subuids.length); + DEBUG(p, " subuid = %u (%zu)\n", p->user.subuids.id, p->user.subuids.length); if (p->group.subgids.id) - DEBUG(p, " subgid = %d (%zu)\n", p->group.subgids.id, p->group.subgids.length); + DEBUG(p, " subgid = %u (%zu)\n", p->group.subgids.id, p->group.subgids.length); // Perform some safety checks r = pakfire_safety_checks(p); @@ -1803,7 +1803,7 @@ static la_int64_t pakfire_uid_lookup(void* data, const char* name, la_int64_t ui return pakfire_map_id(pakfire, &pakfire->user.subuids, 0); } - DEBUG(pakfire, "Mapping %s to UID %d\n", name, entry->pw_uid); + DEBUG(pakfire, "Mapping %s to UID %u\n", name, entry->pw_uid); return pakfire_map_id(pakfire, &pakfire->user.subuids, entry->pw_uid); } @@ -1824,7 +1824,7 @@ static la_int64_t pakfire_gid_lookup(void* data, const char* name, la_int64_t gi return pakfire_map_id(pakfire, &pakfire->group.subgids, 0); } - DEBUG(pakfire, "Mapping %s to GID %d\n", name, entry->gr_gid); + DEBUG(pakfire, "Mapping %s to GID %u\n", name, entry->gr_gid); return pakfire_map_id(pakfire, &pakfire->group.subgids, entry->gr_gid); } diff --git a/src/libpakfire/parser.c b/src/libpakfire/parser.c index 38e7c955d..b65f16a7b 100644 --- a/src/libpakfire/parser.c +++ b/src/libpakfire/parser.c @@ -325,7 +325,7 @@ int pakfire_parser_set(struct pakfire_parser* parser, // Import flags d->flags = flags; - DEBUG(parser->pakfire, "%p: New declaration (%d): %s.%s %s= %s\n", + DEBUG(parser->pakfire, "%p: New declaration (%u): %s.%s %s= %s\n", parser, d->flags, d->namespace, diff --git a/src/libpakfire/parser/grammar.y b/src/libpakfire/parser/grammar.y index 8d394f84f..b97df9f68 100644 --- a/src/libpakfire/parser/grammar.y +++ b/src/libpakfire/parser/grammar.y @@ -80,7 +80,7 @@ static void yyerror(yyscan_t* scanner, struct pakfire* pakfire, struct pakfire_p struct pakfire_parser* parent, struct pakfire_parser_error** error, const char* s) { const struct pakfire_parser_state* state = yyget_extra(scanner); - ERROR(pakfire, "Error (line %d): %s\n", state->lineno, s); + ERROR(pakfire, "Error (line %u): %s\n", state->lineno, s); // Create a new error object if (error) { diff --git a/src/libpakfire/pwd.c b/src/libpakfire/pwd.c index 4178c04a9..72cfff943 100644 --- a/src/libpakfire/pwd.c +++ b/src/libpakfire/pwd.c @@ -267,7 +267,7 @@ ERROR: free(line); if (!r) - DEBUG(pakfire, "Parsed SUBID entry: name=%s, id=%d, length=%zu\n", + DEBUG(pakfire, "Parsed SUBID entry: name=%s, id=%u, length=%zu\n", subid->name, subid->id, subid->length); return r; diff --git a/src/libpakfire/transaction.c b/src/libpakfire/transaction.c index da7395fbc..ab21c6136 100644 --- a/src/libpakfire/transaction.c +++ b/src/libpakfire/transaction.c @@ -133,7 +133,8 @@ static enum pakfire_steps pakfire_transaction_get_step_type( return PAKFIRE_STEP_DOWNGRADED; default: - ERROR(transaction->pakfire, "Unhandled step type 0x%x. Ignoring.\n", type); + ERROR(transaction->pakfire, "Unhandled step type 0x%x. Ignoring.\n", + (unsigned int)type); return PAKFIRE_STEP_UNKNOWN; } } @@ -490,7 +491,7 @@ static int pakfire_transaction_append_problems( return -errno; // Append the string to the buffer - r = asprintf(buffer, "%s* %s\n", *buffer, s); + r = asprintf(buffer, "%s* %s\n", (*buffer) ? *buffer : "", s); if (r < 0) return -errno; @@ -1606,7 +1607,7 @@ static int pakfire_transaction_run_step(struct pakfire_transaction* transaction, } if (r) - ERROR(transaction->pakfire, "Step %s (%d) for %s has failed: %m\n", + ERROR(transaction->pakfire, "Step %s (%u) for %s has failed: %m\n", pakfire_action_type_string(action), type, nevra); return r; @@ -1641,7 +1642,7 @@ static int pakfire_transaction_run_steps(struct pakfire_transaction* transaction // End loop if action was unsuccessful if (r) { - DEBUG(transaction->pakfire, "Step %d failed: %m\n", i); + DEBUG(transaction->pakfire, "Step %u failed: %m\n", i); break; } }