mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ar/string-list-foreach'

Browse Source 
* ar/string-list-foreach:
  Convert the users of for_each_string_list to for_each_string_list_item macro
  Add a for_each_string_list_item macro
This commit is contained in:
Junio C Hamano
2010-08-18 12:14:38 -07:00
parent d425aa5cac 8a57c6e943
commit c7e375de42
5 changed files with 69 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
builtin/ls-files.c
View File

@ -172,33 +172,32 @@ static void show_ce_entry(const char *tag, struct cache_entry *ce)
}
}
static int show_one_ru(struct string_list_item *item, void *cbdata)
{
const char *path = item->string;
struct resolve_undo_info *ui = item->util;
int i, len;
len = strlen(path);
if (len < max_prefix_len)
return 0; /* outside of the prefix */
if (!match_pathspec(pathspec, path, len, max_prefix_len, ps_matched))
return 0; /* uninterested */
for (i = 0; i < 3; i++) {
if (!ui->mode[i])
continue;
printf("%s%06o %s %d\t", tag_resolve_undo, ui->mode[i],
find_unique_abbrev(ui->sha1[i], abbrev),
i + 1);
write_name(path, len);
}
return 0;
}
static void show_ru_info(void)
{
struct string_list_item *item;
if (!the_index.resolve_undo)
return;
for_each_string_list(the_index.resolve_undo, show_one_ru, NULL);
for_each_string_list_item(item, the_index.resolve_undo) {
const char *path = item->string;
struct resolve_undo_info *ui = item->util;
int i, len;
len = strlen(path);
if (len < max_prefix_len)
continue; /* outside of the prefix */
if (!match_pathspec(pathspec, path, len, max_prefix_len, ps_matched))
continue; /* uninterested */
for (i = 0; i < 3; i++) {
if (!ui->mode[i])
continue;
printf("%s%06o %s %d\t", tag_resolve_undo, ui->mode[i],
find_unique_abbrev(ui->sha1[i], abbrev),
i + 1);
write_name(path, len);
}
}
}
static void show_files(struct dir_struct *dir)