Fix workdir notifications and removals

[libgit2.git] / src / vector.h

diff --git a/src/vector.h b/src/vector.h
index ae3882558f0793a9bc765264baea7ca17903f9c7..15356ef168f943caabe3ab397ec1e655bfc8ace8 100644 (file)
--- a/src/vector.h
+++ b/src/vector.h
@@ -12,32 +12,61 @@
 typedef int (*git_vector_cmp)(const void *, const void *);
 
 typedef struct git_vector {
-       unsigned int _alloc_size;
+       size_t _alloc_size;
        git_vector_cmp _cmp;
        void **contents;
-       unsigned int length;
+       size_t length;
        int sorted;
 } git_vector;
 
 #define GIT_VECTOR_INIT {0}
 
-int git_vector_init(git_vector *v, unsigned int initial_size, git_vector_cmp cmp);
+int git_vector_init(git_vector *v, size_t initial_size, git_vector_cmp cmp);
 void git_vector_free(git_vector *v);
 void git_vector_clear(git_vector *v);
+int git_vector_dup(git_vector *v, const git_vector *src, git_vector_cmp cmp);
+void git_vector_swap(git_vector *a, git_vector *b);
 
-int git_vector_search(git_vector *v, const void *entry);
-int git_vector_search2(git_vector *v, git_vector_cmp cmp, const void *key);
+void git_vector_sort(git_vector *v);
 
-int git_vector_bsearch(git_vector *v, const void *entry);
-int git_vector_bsearch2(git_vector *v, git_vector_cmp cmp, const void *key);
+/** Linear search for matching entry using internal comparison function */
+int git_vector_search(const git_vector *v, const void *entry);
 
-void git_vector_sort(git_vector *v);
+/** Linear search for matching entry using explicit comparison function */
+int git_vector_search2(const git_vector *v, git_vector_cmp cmp, const void *key);
+
+/**
+ * Binary search for matching entry using explicit comparison function that
+ * returns position where item would go if not found.
+ */
+int git_vector_bsearch3(
+       size_t *at_pos, git_vector *v, git_vector_cmp cmp, const void *key);
 
-GIT_INLINE(void *) git_vector_get(git_vector *v, unsigned int position)
+/** Binary search for matching entry using internal comparison function */
+GIT_INLINE(int) git_vector_bsearch(git_vector *v, const void *key)
+{
+       return git_vector_bsearch3(NULL, v, v->_cmp, key);
+}
+
+/** Binary search for matching entry using explicit comparison function */
+GIT_INLINE(int) git_vector_bsearch2(
+       git_vector *v, git_vector_cmp cmp, const void *key)
+{
+       return git_vector_bsearch3(NULL, v, cmp, key);
+}
+
+GIT_INLINE(void *) git_vector_get(const git_vector *v, size_t position)
 {
        return (position < v->length) ? v->contents[position] : NULL;
 }
 
+#define GIT_VECTOR_GET(V,I) ((I) < (V)->length ? (V)->contents[(I)] : NULL)
+
+GIT_INLINE(void *) git_vector_last(const git_vector *v)
+{
+       return (v->length > 0) ? git_vector_get(v, v->length - 1) : NULL;
+}
+
 #define git_vector_foreach(v, iter, elem)      \
        for ((iter) = 0; (iter) < (v)->length && ((elem) = (v)->contents[(iter)], 1); (iter)++ )
 
@@ -47,7 +76,13 @@ GIT_INLINE(void *) git_vector_get(git_vector *v, unsigned int position)
 int git_vector_insert(git_vector *v, void *element);
 int git_vector_insert_sorted(git_vector *v, void *element,
        int (*on_dup)(void **old, void *new));
-int git_vector_remove(git_vector *v, unsigned int idx);
+int git_vector_remove(git_vector *v, size_t idx);
+void git_vector_pop(git_vector *v);
 void git_vector_uniq(git_vector *v);
+void git_vector_remove_matching(
+       git_vector *v, int (*match)(const git_vector *v, size_t idx));
+
+int git_vector_resize_to(git_vector *v, size_t new_length);
+int git_vector_set(void **old, git_vector *v, size_t position, void *value);
 
 #endif