diff options
| -rw-r--r-- | fmap.c | 8 | ||||
| -rw-r--r-- | libflashrom.c | 2 | ||||
| -rw-r--r-- | libflashrom.h | 2 |
3 files changed, 6 insertions, 6 deletions
@@ -91,15 +91,15 @@ static int is_valid_fmap(const struct fmap *fmap) * -1 to indicate that fmap was not found * -2 to indicate fmap is truncated or exceeds buffer + len */ -static off_t fmap_lsearch(const uint8_t *buf, size_t len) +static ssize_t fmap_lsearch(const uint8_t *buf, size_t len) { - off_t offset; + ssize_t offset; bool fmap_found = 0; if (len < sizeof(struct fmap)) return -1; - for (offset = 0; offset <= (off_t)(len - sizeof(struct fmap)); offset++) { + for (offset = 0; offset <= (ssize_t)(len - sizeof(struct fmap)); offset++) { if (is_valid_fmap((struct fmap *)&buf[offset])) { fmap_found = 1; break; @@ -131,7 +131,7 @@ static off_t fmap_lsearch(const uint8_t *buf, size_t len) */ int fmap_read_from_buffer(struct fmap **fmap_out, const uint8_t *const buf, size_t len) { - off_t offset = fmap_lsearch(buf, len); + ssize_t offset = fmap_lsearch(buf, len); if (offset < 0) { msg_gdbg("Unable to find fmap in provided buffer.\n"); return 2; diff --git a/libflashrom.c b/libflashrom.c index fb7093450..d66c29596 100644 --- a/libflashrom.c +++ b/libflashrom.c @@ -534,7 +534,7 @@ static int flashrom_layout_parse_fmap(struct flashrom_layout **layout, * 1 on any other error. */ int flashrom_layout_read_fmap_from_rom(struct flashrom_layout **const layout, - struct flashctx *const flashctx, off_t offset, size_t len) + struct flashctx *const flashctx, size_t offset, size_t len) { #ifndef __FLASHROM_LITTLE_ENDIAN__ return 3; diff --git a/libflashrom.h b/libflashrom.h index 557978d4d..1c9498ec5 100644 --- a/libflashrom.h +++ b/libflashrom.h @@ -109,7 +109,7 @@ struct flashrom_layout; int flashrom_layout_new(struct flashrom_layout **); int flashrom_layout_read_from_ifd(struct flashrom_layout **, struct flashrom_flashctx *, const void *dump, size_t len); int flashrom_layout_read_fmap_from_rom(struct flashrom_layout **, - struct flashrom_flashctx *, off_t offset, size_t length); + struct flashrom_flashctx *, size_t offset, size_t length); int flashrom_layout_read_fmap_from_buffer(struct flashrom_layout **layout, struct flashrom_flashctx *, const uint8_t *buf, size_t len); int flashrom_layout_add_region(struct flashrom_layout *, size_t start, size_t end, const char *name); |