summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2018-06-15 03:32:28 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-06-18 17:16:19 (GMT)
commit26675087a58e1e7dd54bc0f059ad2f831c6e3fbf (patch)
treea8e15008cb6ffb8b2a4af38afb9ce4fc19f5883f
parentcaa88140d4cc9e0ac79bb5d9d6569fe7d08a93a8 (diff)
downloadgit-26675087a58e1e7dd54bc0f059ad2f831c6e3fbf.zip
git-26675087a58e1e7dd54bc0f059ad2f831c6e3fbf.tar.gz
git-26675087a58e1e7dd54bc0f059ad2f831c6e3fbf.tar.bz2
ewah: drop ewah_serialize_native function
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> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--ewah/ewah_io.c26
-rw-r--r--ewah/ewok.h1
2 files changed, 0 insertions, 27 deletions
diff --git a/ewah/ewah_io.c b/ewah/ewah_io.c
index 5e8fa9e..9035ee6 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 e32a09c..0c504f2 100644
--- a/ewah/ewok.h
+++ b/ewah/ewok.h
@@ -86,7 +86,6 @@ void ewah_free(struct ewah_bitmap *self);
int ewah_serialize_to(struct ewah_bitmap *self,
int (*write_fun)(void *out, const void *buf, size_t len),
void *out);
-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);