Commit dbbce55b authored by Brad Roberts's avatar Brad Roberts Committed by Petr Baudis

Rename some more cache-related functions

same_name -> ce_same_name()
remove_entry_at() -> remove_cache_entry_at()
Signed-off-by: Brad Roberts's avatarBrad Roberts <[email protected]>
Signed-off-by: Petr Baudis's avatarPetr Baudis <[email protected]>
parent 5d728c84
......@@ -126,9 +126,9 @@ extern int cache_name_pos(const char *name, int namelen);
#define ADD_CACHE_OK_TO_ADD 1 /* Ok to add */
#define ADD_CACHE_OK_TO_REPLACE 2 /* Ok to replace file/directory */
extern int add_cache_entry(struct cache_entry *ce, int option);
extern int remove_entry_at(int pos);
extern int remove_cache_entry_at(int pos);
extern int remove_file_from_cache(char *path);
extern int same_name(struct cache_entry *a, struct cache_entry *b);
extern int ce_same_name(struct cache_entry *a, struct cache_entry *b);
extern int ce_match_stat(struct cache_entry *ce, struct stat *st);
extern int index_fd(unsigned char *sha1, int fd, struct stat *st);
......
......@@ -94,7 +94,7 @@ static int diff_cache(struct cache_entry **ac, int entries)
{
while (entries) {
struct cache_entry *ce = *ac;
int same = (entries > 1) && same_name(ce, ac[1]);
int same = (entries > 1) && ce_same_name(ce, ac[1]);
switch (ce_stage(ce)) {
case 0:
......@@ -143,7 +143,7 @@ static int diff_cache(struct cache_entry **ac, int entries)
do {
ac++;
entries--;
} while (entries && same_name(ce, ac[0]));
} while (entries && ce_same_name(ce, ac[0]));
}
return 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);
......@@ -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;
}
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment