Skip to content

Commit

Permalink
Rename add_file_to_index() to add_file_to_cache()
Browse files Browse the repository at this point in the history
This function was not called "add_file_to_cache()" only because
an ancient program, update-cache, used that name as an internal
function name that does something slightly different.  Now that
is gone, we can take over the better name.

The plan is to name all functions that operate on the default
index xxx_cache().  Later patches create a variant of them that
take an explicit parameter xxx_index(), and then turn
xxx_cache() functions into macros that use "the_index".

Signed-off-by: Junio C Hamano <junkio@cox.net>
  • Loading branch information
Junio C Hamano committed Apr 5, 2007
1 parent 7da3bf3 commit fd1c3bf
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion builtin-add.c
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ int cmd_add(int argc, const char **argv, const char *prefix)
}

for (i = 0; i < dir.nr; i++)
add_file_to_index(dir.entries[i]->name, verbose);
add_file_to_cache(dir.entries[i]->name, verbose);

if (active_cache_changed) {
if (write_cache(newfd, active_cache, active_nr) ||
Expand Down
2 changes: 1 addition & 1 deletion builtin-mv.c
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ int cmd_mv(int argc, const char **argv, const char *prefix)

for (i = 0; i < added.nr; i++) {
const char *path = added.items[i].path;
add_file_to_index(path, verbose);
add_file_to_cache(path, verbose);
}

for (i = 0; i < deleted.nr; i++) {
Expand Down
2 changes: 1 addition & 1 deletion cache.h
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ extern int add_cache_entry(struct cache_entry *ce, int option);
extern struct cache_entry *refresh_cache_entry(struct cache_entry *ce, int really);
extern int remove_cache_entry_at(int pos);
extern int remove_file_from_cache(const char *path);
extern int add_file_to_index(const char *path, int verbose);
extern int add_file_to_cache(const char *path, int verbose);
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, int);
extern int ce_modified(struct cache_entry *ce, struct stat *st, int);
Expand Down
2 changes: 1 addition & 1 deletion read-cache.c
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@ int remove_file_from_cache(const char *path)
return 0;
}

int add_file_to_index(const char *path, int verbose)
int add_file_to_cache(const char *path, int verbose)
{
int size, namelen;
struct stat st;
Expand Down

0 comments on commit fd1c3bf

Please sign in to comment.