diff options
Diffstat (limited to 'futility')
| -rw-r--r-- | futility/cmd_update.c | 2 | ||||
| -rw-r--r-- | futility/updater.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/futility/cmd_update.c b/futility/cmd_update.c index d64ed13a..abf1dcab 100644 --- a/futility/cmd_update.c +++ b/futility/cmd_update.c @@ -245,7 +245,7 @@ static int do_update(int argc, char *argv[]) STATUS("Starting firmware updater.\n"); r = update_firmware(cfg); if (r != UPDATE_ERR_DONE) { - r = Min(r, UPDATE_ERR_UNKNOWN); + r = VB2_MIN(r, UPDATE_ERR_UNKNOWN); ERROR("%s\n", updater_error_messages[r]); errorcnt++; } diff --git a/futility/updater.c b/futility/updater.c index 82ee4a44..ef142b8b 100644 --- a/futility/updater.c +++ b/futility/updater.c @@ -814,7 +814,7 @@ static int emulate_write_firmware(const char *filename, } if (!errorcnt) { - size_t to_write = Min(to.size, from.size); + size_t to_write = VB2_MIN(to.size, from.size); assert(from.data && to.data); VB2_DEBUG("Writing %zu bytes\n", to_write); @@ -949,7 +949,7 @@ int preserve_firmware_section(const struct firmware_image *image_from, FMAP_NAMELEN, section_name); } /* Use memmove in case if we need to deal with sections that overlap. */ - memmove(to.data, from.data, Min(from.size, to.size)); + memmove(to.data, from.data, VB2_MIN(from.size, to.size)); return 0; } |