| Message ID | 20240307221030.3685767-2-colin.mcallister@garmin.com |
|---|---|
| State | Superseded |
| Delegated to: | Mattijs Korpershoek |
| Headers | show |
| Series | Fix Android A/B backup | expand |
On Thu, Mar 7, 2024 at 4:11 PM Colin McAllister <colin.mcallister@garmin.com> wrote: > > Found a missing semicolon in code protected by a #if that will never > evaluate to true due to a separate issue. Fixing this issue before > addressing the #if. > > Signed-off-by: Colin McAllister <colin.mcallister@garmin.com> > Cc: Joshua Watt <JPEWhacker@gmail.com> > Cc: Simon Glass <sjg@chromium.org> > --- > boot/android_ab.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/boot/android_ab.c b/boot/android_ab.c > index c9df6d2b4b..9a3d15ec60 100644 > --- a/boot/android_ab.c > +++ b/boot/android_ab.c > @@ -221,7 +221,7 @@ int ab_select_slot(struct blk_desc *dev_desc, struct disk_partition *part_info, > #if ANDROID_AB_BACKUP_OFFSET > crc32_le = ab_control_compute_crc(backup_abc); > if (backup_abc->crc32_le != crc32_le) { > - log_err("ANDROID: Invalid backup CRC-32 ") > + log_err("ANDROID: Invalid backup CRC-32 "); Good catch! Wonder why there is also a trailing space in the end of the string. Anyways, I think this patch deserves "Fixes:" tag, would you mind adding it? Other than that: Reviewed-by: Sam Protsenko <semen.protsenko@linaro.org> > log_err("expected %.8x, found %.8x),", > crc32_le, backup_abc->crc32_le); > #endif > -- > 2.43.2 > > > ________________________________ > > CONFIDENTIALITY NOTICE: This email and any attachments are for the sole use of the intended recipient(s) and contain information that may be Garmin confidential and/or Garmin legally privileged. If you have received this email in error, please notify the sender by reply email and delete the message. Any disclosure, copying, distribution or use of this communication (including attachments) by someone other than the intended recipient is prohibited. Thank you.
On jeu., mars 07, 2024 at 16:54, Sam Protsenko <semen.protsenko@linaro.org> wrote: > On Thu, Mar 7, 2024 at 4:11 PM Colin McAllister > <colin.mcallister@garmin.com> wrote: >> >> Found a missing semicolon in code protected by a #if that will never >> evaluate to true due to a separate issue. Fixing this issue before >> addressing the #if. >> >> Signed-off-by: Colin McAllister <colin.mcallister@garmin.com> >> Cc: Joshua Watt <JPEWhacker@gmail.com> >> Cc: Simon Glass <sjg@chromium.org> >> --- >> boot/android_ab.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/boot/android_ab.c b/boot/android_ab.c >> index c9df6d2b4b..9a3d15ec60 100644 >> --- a/boot/android_ab.c >> +++ b/boot/android_ab.c >> @@ -221,7 +221,7 @@ int ab_select_slot(struct blk_desc *dev_desc, struct disk_partition *part_info, >> #if ANDROID_AB_BACKUP_OFFSET >> crc32_le = ab_control_compute_crc(backup_abc); >> if (backup_abc->crc32_le != crc32_le) { >> - log_err("ANDROID: Invalid backup CRC-32 ") >> + log_err("ANDROID: Invalid backup CRC-32 "); > > Good catch! Wonder why there is also a trailing space in the end of > the string. Anyways, I think this patch deserves "Fixes:" tag, would > you mind adding it? Other than that: The file seems to have weird trailing/leading whitespaces in some of the error messages. I think it's fine to keep this as is for now. We can make another series to fix this after Colin's work gets merged. > > Reviewed-by: Sam Protsenko <semen.protsenko@linaro.org> > >> log_err("expected %.8x, found %.8x),", >> crc32_le, backup_abc->crc32_le); >> #endif >> -- >> 2.43.2 >> >> >> ________________________________ >> >> CONFIDENTIALITY NOTICE: This email and any attachments are for the sole use of the intended recipient(s) and contain information that may be Garmin confidential and/or Garmin legally privileged. If you have received this email in error, please notify the sender by reply email and delete the message. Any disclosure, copying, distribution or use of this communication (including attachments) by someone other than the intended recipient is prohibited. Thank you.
diff --git a/boot/android_ab.c b/boot/android_ab.c index c9df6d2b4b..9a3d15ec60 100644 --- a/boot/android_ab.c +++ b/boot/android_ab.c @@ -221,7 +221,7 @@ int ab_select_slot(struct blk_desc *dev_desc, struct disk_partition *part_info, #if ANDROID_AB_BACKUP_OFFSET crc32_le = ab_control_compute_crc(backup_abc); if (backup_abc->crc32_le != crc32_le) { - log_err("ANDROID: Invalid backup CRC-32 ") + log_err("ANDROID: Invalid backup CRC-32 "); log_err("expected %.8x, found %.8x),", crc32_le, backup_abc->crc32_le); #endif
Found a missing semicolon in code protected by a #if that will never evaluate to true due to a separate issue. Fixing this issue before addressing the #if. Signed-off-by: Colin McAllister <colin.mcallister@garmin.com> Cc: Joshua Watt <JPEWhacker@gmail.com> Cc: Simon Glass <sjg@chromium.org> --- boot/android_ab.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.43.2