summaryrefslogtreecommitdiff
path: root/pack-bitmap.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-12-12 14:31:41 -0800
committerJunio C Hamano <gitster@pobox.com>2014-12-12 14:31:42 -0800
commit3889e7a60c65031f0c5381d8060cefb4294d932e (patch)
treef63aa1e6a391e3fede0821e003b257ddfc721a2c /pack-bitmap.c
parent23c0956441a101b2e8eca7e063e71bdc69a0c415 (diff)
parentb5007211b6582fc38647ff695b5ac51541ea9de8 (diff)
downloadgit-3889e7a60c65031f0c5381d8060cefb4294d932e.tar.gz
Merge branch 'jk/pack-bitmap'
* jk/pack-bitmap: pack-bitmap: do not use gcc packed attribute
Diffstat (limited to 'pack-bitmap.c')
-rw-r--r--pack-bitmap.c22
1 files changed, 15 insertions, 7 deletions
diff --git a/pack-bitmap.c b/pack-bitmap.c
index a1f3c0d34f..6a818419ca 100644
--- a/pack-bitmap.c
+++ b/pack-bitmap.c
@@ -197,13 +197,24 @@ static struct stored_bitmap *store_bitmap(struct bitmap_index *index,
return stored;
}
+static inline uint32_t read_be32(const unsigned char *buffer, size_t *pos)
+{
+ uint32_t result = get_be32(buffer + *pos);
+ (*pos) += sizeof(result);
+ return result;
+}
+
+static inline uint8_t read_u8(const unsigned char *buffer, size_t *pos)
+{
+ return buffer[(*pos)++];
+}
+
static int load_bitmap_entries_v1(struct bitmap_index *index)
{
static const size_t MAX_XOR_OFFSET = 160;
uint32_t i;
struct stored_bitmap **recent_bitmaps;
- struct bitmap_disk_entry *entry;
recent_bitmaps = xcalloc(MAX_XOR_OFFSET, sizeof(struct stored_bitmap));
@@ -214,15 +225,12 @@ static int load_bitmap_entries_v1(struct bitmap_index *index)
uint32_t commit_idx_pos;
const unsigned char *sha1;
- entry = (struct bitmap_disk_entry *)(index->map + index->map_pos);
- index->map_pos += sizeof(struct bitmap_disk_entry);
+ commit_idx_pos = read_be32(index->map, &index->map_pos);
+ xor_offset = read_u8(index->map, &index->map_pos);
+ flags = read_u8(index->map, &index->map_pos);
- commit_idx_pos = ntohl(entry->object_pos);
sha1 = nth_packed_object_sha1(index->pack, commit_idx_pos);
- xor_offset = (int)entry->xor_offset;
- flags = (int)entry->flags;
-
bitmap = read_bitmap_1(index);
if (!bitmap)
return -1;