Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Avoid format error on i686 #211

Merged
merged 1 commit into from
Apr 5, 2022
Merged

Avoid format error on i686 #211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions src/esl-iter.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,13 +308,13 @@ esl_list_iter_next_with_size_correction(esl_list_iter *iter, efi_guid_t *type,
return -1;
}
if (iter->offset < 0) {
efi_error("iter->offset (%zd) < 0", iter->offset);
efi_error("iter->offset (%jd) < 0", (intmax_t)iter->offset);
errno = EINVAL;
return -1;
}
if ((uint32_t)iter->offset >= iter->len) {
efi_error("iter->offset (%zd) >= iter->len (%zd)",
iter->offset, iter->len);
efi_error("iter->offset (%jd) >= iter->len (%zd)",
(intmax_t)iter->offset, iter->len);
errno = EINVAL;
return -1;
}
Expand All @@ -335,9 +335,9 @@ esl_list_iter_next_with_size_correction(esl_list_iter *iter, efi_guid_t *type,
iter->len - iter->offset, iter->len - iter->offset,
iter->esl->signature_list_size, iter->esl->signature_list_size);
if (correct_size && (iter->len - iter->offset) > 0) {
warnx("correcting ESL size from %d to %zd at %lx",
warnx("correcting ESL size from %d to %jd at %lx",
iter->esl->signature_list_size,
iter->len - iter->offset, iter->offset);
(intmax_t)(iter->len - iter->offset), iter->offset);
debug("correcting ESL size from %d to %zd at %lx",
iter->esl->signature_list_size,
iter->len - iter->offset, iter->offset);
Expand All @@ -360,9 +360,9 @@ esl_list_iter_next_with_size_correction(esl_list_iter *iter, efi_guid_t *type,
if (iter->len - iter->offset < iter->esl->signature_list_size) {
debug("EFI_SIGNATURE_LIST is malformed");
if (correct_size && (iter->len - iter->offset) > 0) {
warnx("correcting ESL size from %d to %zd at 0x%lx",
warnx("correcting ESL size from %d to %jd at 0x%lx",
iter->esl->signature_list_size,
iter->len - iter->offset, iter->offset);
(intmax_t)(iter->len - iter->offset), iter->offset);
debug("correcting ESL size from %d to %zd at 0x%lx",
iter->esl->signature_list_size,
iter->len - iter->offset, iter->offset);
Expand Down Expand Up @@ -411,9 +411,9 @@ esl_list_iter_next_with_size_correction(esl_list_iter *iter, efi_guid_t *type,
if (iter->esl->signature_list_size > iter->len - iter->offset) {
debug("EFI_SIGNATURE_LIST is malformed");
if (correct_size && (iter->len - iter->offset) > 0) {
warnx("correcting ESL size from %d to %zd at 0x%lx",
warnx("correcting ESL size from %d to %jd at 0x%lx",
iter->esl->signature_list_size,
iter->len - iter->offset, iter->offset);
(intmax_t)(iter->len - iter->offset), iter->offset);
debug("correcting ESL size from %d to %zd at 0x%lx",
iter->esl->signature_list_size,
iter->len - iter->offset, iter->offset);
Expand Down
2 changes: 1 addition & 1 deletion src/secdb-dump.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ secdb_dump(efi_secdb_t *secdb, bool annotations)
esln += 1;
}
secdb_dump_finish();
printf("%08lx\n", offset);
printf("%08zx\n", offset);

fflush(stdout);
}
Expand Down