diff-tree: clean up diff_tree_stdin() function

[git.git] / read-cache.c

diff --git a/read-cache.c b/read-cache.c
index 47aa2d4..14ed4fd 100644 (file)
--- a/read-cache.c
+++ b/read-cache.c
@@ -9,7 +9,7 @@
 struct cache_entry **active_cache = NULL;
 unsigned int active_nr = 0, active_alloc = 0, active_cache_changed = 0;
 
-int cache_match_stat(struct cache_entry *ce, struct stat *st)
+int ce_match_stat(struct cache_entry *ce, struct stat *st)
 {
        unsigned int changed = 0;
 
@@ -97,7 +97,7 @@ int cache_name_pos(const char *name, int namelen)
 }
 
 /* Remove entry, return true if there are more entries to go.. */
-int remove_entry_at(int pos)
+int remove_cache_entry_at(int pos)
 {
        active_cache_changed = 1;
        active_nr--;
@@ -113,11 +113,11 @@ int remove_file_from_cache(char *path)
        if (pos < 0)
                pos = -pos-1;
        while (pos < active_nr && !strcmp(active_cache[pos]->name, path))
-               remove_entry_at(pos);
+               remove_cache_entry_at(pos);
        return 0;
 }
 
-int same_name(struct cache_entry *a, struct cache_entry *b)
+int ce_same_name(struct cache_entry *a, struct cache_entry *b)
 {
        int len = ce_namelen(a);
        return ce_namelen(b) == len && !memcmp(a->name, b->name, len);
@@ -152,7 +152,7 @@ static int check_file_directory_conflict(const struct cache_entry *ce,
        cp = pathbuf;
        while (1) {
                char *ep = strchr(cp, '/');
-               if (ep == 0)
+               if (!ep)
                        break;
                *ep = 0;    /* first cut it at slash */
                pos = cache_name_pos(pathbuf,
@@ -167,7 +167,7 @@ static int check_file_directory_conflict(const struct cache_entry *ce,
                                return -1;
                        }
                        fprintf(stderr, "removing file '%s' to replace it with a directory to create '%s'.\n", pathbuf, path);
-                       remove_entry_at(pos);
+                       remove_cache_entry_at(pos);
                        replaced = 1;
                }
                *ep = '/';  /* then restore it and go downwards */
@@ -215,7 +215,7 @@ static int check_file_directory_conflict(const struct cache_entry *ce,
                        if (!ok_to_replace)
                                return -1;
                        fprintf(stderr, "removing file '%s' under '%s' to be replaced with a file\n", other->name, path);
-                       remove_entry_at(pos);
+                       remove_cache_entry_at(pos);
                        replaced = 1;
                        continue; /* cycle without updating pos */
                }
@@ -244,9 +244,9 @@ int add_cache_entry(struct cache_entry *ce, int option)
         * will always replace all non-merged entries..
         */
        if (pos < active_nr && ce_stage(ce) == 0) {
-               while (same_name(active_cache[pos], ce)) {
+               while (ce_same_name(active_cache[pos], ce)) {
                        ok_to_add = 1;
-                       if (!remove_entry_at(pos))
+                       if (!remove_cache_entry_at(pos))
                                break;
                }
        }
@@ -344,7 +344,7 @@ unmap:
 }
 
 #define WRITE_BUFFER_SIZE 8192
-static char write_buffer[WRITE_BUFFER_SIZE];
+static unsigned char write_buffer[WRITE_BUFFER_SIZE];
 static unsigned long write_buffer_len;
 
 static int ce_write(SHA_CTX *context, int fd, void *data, unsigned int len)