Skip to content

Fix return value when payload update fails #184

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

Open
xorptr wants to merge 1 commit into
base: main
Choose a base branch
from
+6 −5
Open

Fix return value when payload update fails #184

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
8 changes: 4 additions & 4 deletions protocol/payload_update.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,8 @@ enum payload_update_err libhoth_payload_update(struct libhoth_device* dev,
for (; offset + block_erase <= size; offset += block_erase) {
const int ret = payload_update_erase(dev, offset, block_erase);
if (ret != 0) {
fprintf(stderr, "block erase err: %d\n", ret);
return ret;
fprintf(stderr, "block erase offset 0x%zx err: %d\n", offset, ret);
return PAYLOAD_UPDATE_ERASE_FAIL;
}
erase_progress.progress.func(erase_progress.progress.param, offset, size);
}
Expand All @@ -125,8 +125,8 @@ enum payload_update_err libhoth_payload_update(struct libhoth_device* dev,
for (; offset + sector_erase <= size; offset += sector_erase) {
const int ret = payload_update_erase(dev, offset, sector_erase);
if (ret != 0) {
fprintf(stderr, "sector erase err: %d\n", ret);
return ret;
fprintf(stderr, "sector erase offset 0x%zx err: %d\n", offset, ret);
return PAYLOAD_UPDATE_ERASE_FAIL;
}
erase_progress.progress.func(erase_progress.progress.param, offset, size);
}
Expand Down
1 change: 1 addition & 0 deletions protocol/payload_update.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ enum payload_update_err {
PAYLOAD_UPDATE_FINALIZE_FAIL,
PAYLOAD_UPDATE_READ_FAIL,
PAYLOAD_UPDATE_IMAGE_NOT_SECTOR_ALIGNED,
PAYLOAD_UPDATE_ERASE_FAIL,
};

struct payload_update_packet {
Expand Down
2 changes: 1 addition & 1 deletion protocol/payload_update_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ TEST_F(LibHothTest, payload_update_erase_fail) {
std::memcpy(buffer, &kMagic, sizeof(kMagic));

EXPECT_EQ(libhoth_payload_update(&hoth_dev_, buffer, sizeof(buffer), false),
-1);
PAYLOAD_UPDATE_ERASE_FAIL);
}

TEST_F(LibHothTest, payload_update_flash_fail) {
Expand Down
Loading