Export "cache_name_compare()" helper function.

[git.git] / update-cache.c

diff --git a/update-cache.c b/update-cache.c
index 5085a5cb53ee52e1886ff6d46c609bdb2fc6d6cd..03b111bfc074de8494e9937347357aed9d9cfc69 100644 (file)
--- a/update-cache.c
+++ b/update-cache.c
@@ -1,78 +1,10 @@
+/*
+ * GIT - The information manager from hell
+ *
+ * Copyright (C) Linus Torvalds, 2005
+ */
 #include "cache.h"
 
-static int cache_name_compare(const char *name1, int len1, const char *name2, int len2)
-{
-       int len = len1 < len2 ? len1 : len2;
-       int cmp;
-
-       cmp = memcmp(name1, name2, len);
-       if (cmp)
-               return cmp;
-       if (len1 < len2)
-               return -1;
-       if (len1 > len2)
-               return 1;
-       return 0;
-}
-
-static int cache_name_pos(const char *name, int namelen)
-{
-       int first, last;
-
-       first = 0;
-       last = active_nr;
-       while (last > first) {
-               int next = (last + first) >> 1;
-               struct cache_entry *ce = active_cache[next];
-               int cmp = cache_name_compare(name, namelen, ce->name, ce->namelen);
-               if (!cmp)
-                       return -next-1;
-               if (cmp < 0) {
-                       last = next;
-                       continue;
-               }
-               first = next+1;
-       }
-       return first;
-}
-
-static int remove_file_from_cache(char *path)
-{
-       int pos = cache_name_pos(path, strlen(path));
-       if (pos < 0) {
-               pos = -pos-1;
-               active_nr--;
-               if (pos < active_nr)
-                       memmove(active_cache + pos, active_cache + pos + 1, (active_nr - pos - 1) * sizeof(struct cache_entry *));
-       }
-}
-
-static int add_cache_entry(struct cache_entry *ce)
-{
-       int pos;
-
-       pos = cache_name_pos(ce->name, ce->namelen);
-
-       /* existing match? Just replace it */
-       if (pos < 0) {
-               active_cache[-pos-1] = ce;
-               return 0;
-       }
-
-       /* Make sure the array is big enough .. */
-       if (active_nr == active_alloc) {
-               active_alloc = alloc_nr(active_alloc);
-               active_cache = realloc(active_cache, active_alloc * sizeof(struct cache_entry *));
-       }
-
-       /* Add it in.. */
-       active_nr++;
-       if (active_nr > pos)
-               memmove(active_cache + pos + 1, active_cache + pos, (active_nr - pos - 1) * sizeof(ce));
-       active_cache[pos] = ce;
-       return 0;
-}
-
 static int index_fd(const char *path, int namelen, struct cache_entry *ce, int fd, struct stat *st)
 {
        z_stream stream;
@@ -156,37 +88,6 @@ static int add_file_to_cache(char *path)
        return add_cache_entry(ce);
 }
 
-static int write_cache(int newfd, struct cache_entry **cache, int entries)
-{
-       SHA_CTX c;
-       struct cache_header hdr;
-       int i;
-
-       hdr.signature = CACHE_SIGNATURE;
-       hdr.version = 1;
-       hdr.entries = entries;
-
-       SHA1_Init(&c);
-       SHA1_Update(&c, &hdr, offsetof(struct cache_header, sha1));
-       for (i = 0; i < entries; i++) {
-               struct cache_entry *ce = cache[i];
-               int size = ce_size(ce);
-               SHA1_Update(&c, ce, size);
-       }
-       SHA1_Final(hdr.sha1, &c);
-
-       if (write(newfd, &hdr, sizeof(hdr)) != sizeof(hdr))
-               return -1;
-
-       for (i = 0; i < entries; i++) {
-               struct cache_entry *ce = cache[i];
-               int size = ce_size(ce);
-               if (write(newfd, ce, size) != size)
-                       return -1;
-       }
-       return 0;
-}              
-
 /*
  * We fundamentally don't like some paths: we don't want
  * dot or dot-dot anywhere, and in fact, we don't even want
@@ -245,4 +146,5 @@ int main(int argc, char **argv)
                return 0;
 out:
        unlink(".dircache/index.lock");
+       return 0;
 }