summaryrefslogtreecommitdiff
path: root/cache.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-12-09 21:36:56 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-12-09 21:36:56 (GMT)
commitef87690b27fd1facdc8cc48f6789a930939303a3 (patch)
treeacabf53e3afd63852d8d1a0b11529cbd2e016eae /cache.h
parent51f737e350c79ddf45616fa023692fa557363434 (diff)
parentee7825b58cd423ea63a215c59fc2b7c7a2878af5 (diff)
downloadgit-ef87690b27fd1facdc8cc48f6789a930939303a3.zip
git-ef87690b27fd1facdc8cc48f6789a930939303a3.tar.gz
git-ef87690b27fd1facdc8cc48f6789a930939303a3.tar.bz2
Merge branch 'rs/allocate-cache-entry-individually'
* rs/allocate-cache-entry-individually: cache.h: put single NUL at end of struct cache_entry read-cache.c: allocate index entries individually Conflicts: read-cache.c
Diffstat (limited to 'cache.h')
-rw-r--r--cache.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/cache.h b/cache.h
index 2e6ad36..15c619d 100644
--- a/cache.h
+++ b/cache.h
@@ -306,7 +306,7 @@ static inline unsigned int canon_mode(unsigned int mode)
}
#define flexible_size(STRUCT,len) ((offsetof(struct STRUCT,name) + (len) + 8) & ~7)
-#define cache_entry_size(len) flexible_size(cache_entry,len)
+#define cache_entry_size(len) (offsetof(struct cache_entry,name) + (len) + 1)
#define ondisk_cache_entry_size(len) flexible_size(ondisk_cache_entry,len)
#define ondisk_cache_entry_extended_size(len) flexible_size(ondisk_cache_entry_extended,len)
@@ -316,7 +316,6 @@ struct index_state {
struct string_list *resolve_undo;
struct cache_tree *cache_tree;
struct cache_time timestamp;
- void *alloc;
unsigned name_hash_initialized : 1,
initialized : 1;
struct hash_table name_hash;