proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-02 18:57:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

index: remove file-scope entry size macros

Browse Source 
All index entry size computations are now performed in
`index_entry_size`. As such, we do not need the file-scope macros for
computing these sizes anymore. Remove them and move the `entry_size`
macro into the `index_entry_size` function.
This commit is contained in:
Patrick Steinhardt 2017-05-19 14:22:35 +02:00
parent 46b67034a1
commit 350d2c47bc
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/index.c
View File

@ -54,10 +54,6 @@ static int index_apply_to_wd_diff(git_index *index, int action, const git_strarr
unsigned int flags,
git_index_matched_path_cb cb, void *payload);
#define entry_size(type,len) ((offsetof(type, path) + (len) + 8) & ~7)
#define short_entry_size(len) entry_size(struct entry_short, len)
#define long_entry_size(len) entry_size(struct entry_long, len)
#define minimal_entry_size (offsetof(struct entry_short, path))
static const size_t INDEX_FOOTER_SIZE = GIT_OID_RAWSZ;
@ -2290,10 +2286,12 @@ static size_t index_entry_size(size_t path_len, size_t varint_len, uint32_t flag
else
return offsetof(struct entry_short, path) + path_len + 1 + varint_len;
} else {
#define entry_size(type,len) ((offsetof(type, path) + (len) + 8) & ~7)
if (flags & GIT_IDXENTRY_EXTENDED)
return long_entry_size(path_len);
return entry_size(struct entry_long, path_len);
else
return short_entry_size(path_len);
return entry_size(struct entry_short, path_len);
#undef entry_size
}
}