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

convert: convert get_cached_convert_stats_ascii to take an index

Browse Source 
Signed-off-by: Brandon Williams <bmwill@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Brandon Williams
2017-06-12 15:13:52 -07:00
committed by Junio C Hamano
parent 41dd4330a1
commit a7609c54b3
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
builtin/ls-files.c
View File

@ -63,7 +63,8 @@ static void write_eolinfo(const struct cache_entry *ce, const char *path)
const char *w_txt = ""; const char *w_txt = "";
const char *a_txt = get_convert_attr_ascii(path); const char *a_txt = get_convert_attr_ascii(path);
if (ce && S_ISREG(ce->ce_mode)) if (ce && S_ISREG(ce->ce_mode))
i_txt = get_cached_convert_stats_ascii(ce->name); i_txt = get_cached_convert_stats_ascii(&the_index,
ce->name);
if (!lstat(path, &st) && S_ISREG(st.st_mode)) if (!lstat(path, &st) && S_ISREG(st.st_mode))
w_txt = get_wt_convert_stats_ascii(path); w_txt = get_wt_convert_stats_ascii(path);
printf("i/%-5s w/%-5s attr/%-17s\t", i_txt, w_txt, a_txt); printf("i/%-5s w/%-5s attr/%-17s\t", i_txt, w_txt, a_txt);

5
convert.c
View File

@ -134,11 +134,12 @@ static const char *gather_convert_stats_ascii(const char *data, unsigned long si
} }
} }
const char *get_cached_convert_stats_ascii(const char *path) const char *get_cached_convert_stats_ascii(const struct index_state *istate,
const char *path)
{ {
const char *ret; const char *ret;
unsigned long sz; unsigned long sz;
void *data = read_blob_data_from_cache(path, &sz); void *data = read_blob_data_from_index(istate, path, &sz);
ret = gather_convert_stats_ascii(data, sz); ret = gather_convert_stats_ascii(data, sz);
free(data); free(data);
return ret; return ret;

5
convert.h
View File

@ -4,6 +4,8 @@
#ifndef CONVERT_H #ifndef CONVERT_H
#define CONVERT_H #define CONVERT_H
struct index_state;
enum safe_crlf { enum safe_crlf {
SAFE_CRLF_FALSE = 0, SAFE_CRLF_FALSE = 0,
SAFE_CRLF_FAIL = 1, SAFE_CRLF_FAIL = 1,
@ -33,7 +35,8 @@ enum eol {
}; };
extern enum eol core_eol; extern enum eol core_eol;
extern const char *get_cached_convert_stats_ascii(const char *path); extern const char *get_cached_convert_stats_ascii(const struct index_state *istate,
const char *path);
extern const char *get_wt_convert_stats_ascii(const char *path); extern const char *get_wt_convert_stats_ascii(const char *path);
extern const char *get_convert_attr_ascii(const char *path); extern const char *get_convert_attr_ascii(const char *path);