summaryrefslogtreecommitdiff
path: root/src/sortedcache.c
diff options
context:
space:
mode:
authorRussell Belfer <rb@github.com>2014-02-04 10:01:37 -0800
committerRussell Belfer <rb@github.com>2014-02-04 10:01:37 -0800
commit882c7742711199f757305687c257ac97262a3a30 (patch)
tree72de2a06120aa30875cde571454e77f4441d449c /src/sortedcache.c
parentaf4bc6615d9fe0ebcc4abb939273913bcf9aee60 (diff)
downloadlibgit2-882c7742711199f757305687c257ac97262a3a30.tar.gz
Convert pqueue to just be a git_vector
This updates the git_pqueue to simply be a set of specialized init/insert/pop functions on a git_vector. To preserve the pqueue feature of having a fixed size heap, I converted the "sorted" field in git_vectors to a more general "flags" field so that pqueue could mix in it's own flag. This had a bunch of ramifications because a number of places were directly looking at the vector "sorted" field - I added a couple new git_vector helpers (is_sorted, set_sorted) so the specific representation of this information could be abstracted.
Diffstat (limited to 'src/sortedcache.c')
-rw-r--r--src/sortedcache.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/sortedcache.c b/src/sortedcache.c
index 466e55dbe..13f0921f1 100644
--- a/src/sortedcache.c
+++ b/src/sortedcache.c
@@ -321,7 +321,7 @@ size_t git_sortedcache_entrycount(const git_sortedcache *sc)
void *git_sortedcache_entry(git_sortedcache *sc, size_t pos)
{
/* make sure the items are sorted so this gets the correct item */
- if (!sc->items.sorted)
+ if (!git_vector_is_sorted(&sc->items))
git_vector_sort(&sc->items);
return git_vector_get(&sc->items, pos);