convert: convert get_cached_convert_stats_ascii to take an index
Signed-off-by: Brandon Williams <bmwill@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Brandon Williams committed
Jun 12, 2017 at 15:13 UTC
a7609c54b399219bae5b8b94b305cf8e18bf20f8
3 files changed
+9
-4
builtin/ls-files.c
+2
-1
@@ -63,7 +63,8 @@ static void write_eolinfo(const struct cache_entry *ce, const char *path)
63
const char *w_txt = "";
64
const char *a_txt = get_convert_attr_ascii(path);
65
if (ce && S_ISREG(ce->ce_mode))
66
- i_txt = get_cached_convert_stats_ascii(ce->name);
66
+ i_txt = get_cached_convert_stats_ascii(&the_index,
67
+ ce->name);
68
if (!lstat(path, &st) && S_ISREG(st.st_mode))
69
w_txt = get_wt_convert_stats_ascii(path);
70
printf("i/%-5s w/%-5s attr/%-17s\t", i_txt, w_txt, a_txt);
convert.c
+3
-2
@@ -134,11 +134,12 @@ static const char *gather_convert_stats_ascii(const char *data, unsigned long si
134
}
135
}
136
137
-const char *get_cached_convert_stats_ascii(const char *path)
137
+const char *get_cached_convert_stats_ascii(const struct index_state *istate,
138
+ const char *path)
139
{
140
const char *ret;
141
unsigned long sz;
141
- void *data = read_blob_data_from_cache(path, &sz);
142
+ void *data = read_blob_data_from_index(istate, path, &sz);
143
ret = gather_convert_stats_ascii(data, sz);
144
free(data);
145
return ret;
convert.h
+4
-1
@@ -4,6 +4,8 @@
4
#ifndef CONVERT_H
5
#define CONVERT_H
6
7
+struct index_state;
8
+
9
enum safe_crlf {
10
SAFE_CRLF_FALSE = 0,
11
SAFE_CRLF_FAIL = 1,
@@ -33,7 +35,8 @@ enum eol {
35
};
36
37
extern enum eol core_eol;
36
-extern const char *get_cached_convert_stats_ascii(const char *path);
38
+extern const char *get_cached_convert_stats_ascii(const struct index_state *istate,
39
+ const char *path);
40
extern const char *get_wt_convert_stats_ascii(const char *path);
41
extern const char *get_convert_attr_ascii(const char *path);
42