From: Pieter Noordhuis Date: Sat, 29 May 2010 14:37:47 +0000 (+0200) Subject: use the entry struct in zipRawEntryLength X-Git-Url: https://git.saurik.com/redis.git/commitdiff_plain/bb57b965c4252a48472d99a1b2e7a30d66d65796 use the entry struct in zipRawEntryLength --- diff --git a/ziplist.c b/ziplist.c index d3e3cbaa..16e9dbc1 100644 --- a/ziplist.c +++ b/ziplist.c @@ -209,14 +209,10 @@ static zlentry zipEntry(unsigned char *p) { return e; } -/* Return the total amount used by an entry (encoded length + payload). */ +/* Return the total number of bytes used by the entry at "p". */ static unsigned int zipRawEntryLength(unsigned char *p) { - unsigned int prevlensize, lensize, len; - /* Byte-size of encoded length of previous entry */ - zipDecodeLength(p,&prevlensize); - /* Encoded length of this entry's payload */ - len = zipDecodeLength(p+prevlensize, &lensize); - return prevlensize+lensize+len; + zlentry e = zipEntry(p); + return e.headersize + e.len; } /* Create a new empty ziplist. */