[PATCH 3/3] ewah: drop ewah_serialize_native function
- From
Jeff King <peff@peff.net>
- Date
- Jun 15, 2018, 03:32 UTC
- Message-ID
- <20180615033228.GC20390@sigill.intra.peff.net>
- In-Reply-To
- <20180615032850.GA23241@sigill.intra.peff.net>
We don't call this function, and never have. The on-disk bitmap format uses network-byte-order integers, meaning that we cannot use the native-byte-order format written here.
Let's drop it in the name of simplicity.
Signed-off-by: Jeff King <peff@peff.net> --- ewah/ewah_io.c | 26 -------------------------- ewah/ewok.h | 1 - 2 files changed, 27 deletions(-)
diff --git a/ewah/ewah_io.c b/ewah/ewah_io.c index 97c74266da..586396122f 100644 --- a/ewah/ewah_io.c +++ b/ewah/ewah_io.c @@ -20,32 +20,6 @@ #include "ewok.h" #include "strbuf.h" -int ewah_serialize_native(struct ewah_bitmap *self, int fd) -{ - uint32_t write32; - size_t to_write = self->buffer_size * 8; - - /* 32 bit -- bit size for the map */ - write32 = (uint32_t)self->bit_size; - if (write(fd, &write32, 4) != 4) - return -1; - - /** 32 bit -- number of compressed 64-bit words */ - write32 = (uint32_t)self->buffer_size; - if (write(fd, &write32, 4) != 4) - return -1; - - if (write(fd, self->buffer, to_write) != to_write) - return -1; - - /** 32 bit -- position for the RLW */ - write32 = self->rlw - self->buffer; - if (write(fd, &write32, 4) != 4) - return -1; - - return (3 * 4) + to_write; -} - int ewah_serialize_to(struct ewah_bitmap *self, int (*write_fun)(void *, const void *, size_t), void *data) diff --git a/ewah/ewok.h b/ewah/ewok.h index 7e25ca2e61..e6102e6c75 100644 --- a/ewah/ewok.h +++ b/ewah/ewok.h @@ -87,7 +87,6 @@ int ewah_serialize_to(struct ewah_bitmap *self, int (*write_fun)(void *out, const void *buf, size_t len), void *out); int ewah_serialize(struct ewah_bitmap *self, int fd); -int ewah_serialize_native(struct ewah_bitmap *self, int fd); int ewah_serialize_strbuf(struct ewah_bitmap *self, struct strbuf *); ssize_t ewah_read_mmap(struct ewah_bitmap *self, const void *map, size_t len);
-- 2.18.0.rc2.534.g53d976aeb8