Skip to content

Commit d3aeb31

Browse files
gitstergitster
committed
Merge branch 'nd/const-struct-cache-entry'
* nd/const-struct-cache-entry: Convert "struct cache_entry *" to "const ..." wherever possible
2 parents e9f1a6c + 9c5e6c8 commit d3aeb31

29 files changed

+93
-85
lines changed

‎builtin/apply.c‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2999,7 +2999,7 @@ static int read_blob_object(struct strbuf *buf, const unsigned char *sha1, unsig
29992999
return 0;
30003000
}
30013001

3002-
static int read_file_or_gitlink(struct cache_entry *ce, struct strbuf *buf)
3002+
static int read_file_or_gitlink(const struct cache_entry *ce, struct strbuf *buf)
30033003
{
30043004
if (!ce)
30053005
return 0;
@@ -3117,7 +3117,7 @@ static struct patch *previous_patch(struct patch *patch, int *gone)
31173117
return previous;
31183118
}
31193119

3120-
static int verify_index_match(struct cache_entry *ce, struct stat *st)
3120+
static int verify_index_match(const struct cache_entry *ce, struct stat *st)
31213121
{
31223122
if (S_ISGITLINK(ce->ce_mode)) {
31233123
if (!S_ISDIR(st->st_mode))
@@ -3130,7 +3130,7 @@ static int verify_index_match(struct cache_entry *ce, struct stat *st)
31303130
#define SUBMODULE_PATCH_WITHOUT_INDEX 1
31313131

31323132
static int load_patch_target(struct strbuf *buf,
3133-
struct cache_entry *ce,
3133+
const struct cache_entry *ce,
31343134
struct stat *st,
31353135
const char *name,
31363136
unsigned expected_mode)
@@ -3160,7 +3160,8 @@ static int load_patch_target(struct strbuf *buf,
31603160
* we read from the result of a previous diff.
31613161
*/
31623162
static int load_preimage(struct image *image,
3163-
struct patch *patch, struct stat *st, struct cache_entry *ce)
3163+
struct patch *patch, struct stat *st,
3164+
const struct cache_entry *ce)
31643165
{
31653166
struct strbuf buf = STRBUF_INIT;
31663167
size_t len;
@@ -3273,7 +3274,7 @@ static int load_current(struct image *image, struct patch *patch)
32733274
}
32743275

32753276
static int try_threeway(struct image *image, struct patch *patch,
3276-
struct stat *st, struct cache_entry *ce)
3277+
struct stat *st, const struct cache_entry *ce)
32773278
{
32783279
unsigned char pre_sha1[20], post_sha1[20], our_sha1[20];
32793280
struct strbuf buf = STRBUF_INIT;
@@ -3343,7 +3344,7 @@ static int try_threeway(struct image *image, struct patch *patch,
33433344
return 0;
33443345
}
33453346

3346-
static int apply_data(struct patch *patch, struct stat *st, struct cache_entry *ce)
3347+
static int apply_data(struct patch *patch, struct stat *st, const struct cache_entry *ce)
33473348
{
33483349
struct image image;
33493350

‎builtin/checkout.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,15 +97,15 @@ static int read_tree_some(struct tree *tree, const char **pathspec)
9797
return 0;
9898
}
9999

100-
static int skip_same_name(struct cache_entry *ce, int pos)
100+
static int skip_same_name(const struct cache_entry *ce, int pos)
101101
{
102102
while (++pos < active_nr &&
103103
!strcmp(active_cache[pos]->name, ce->name))
104104
; /* skip */
105105
return pos;
106106
}
107107

108-
static int check_stage(int stage, struct cache_entry *ce, int pos)
108+
static int check_stage(int stage, const struct cache_entry *ce, int pos)
109109
{
110110
while (pos < active_nr &&
111111
!strcmp(active_cache[pos]->name, ce->name)) {
@@ -119,7 +119,7 @@ static int check_stage(int stage, struct cache_entry *ce, int pos)
119119
return error(_("path '%s' does not have their version"), ce->name);
120120
}
121121

122-
static int check_stages(unsigned stages, struct cache_entry *ce, int pos)
122+
static int check_stages(unsigned stages, const struct cache_entry *ce, int pos)
123123
{
124124
unsigned seen = 0;
125125
const char *name = ce->name;
@@ -321,7 +321,7 @@ static int checkout_paths(const struct checkout_opts *opts,
321321

322322
/* Any unmerged paths? */
323323
for (pos = 0; pos < active_nr; pos++) {
324-
struct cache_entry *ce = active_cache[pos];
324+
const struct cache_entry *ce = active_cache[pos];
325325
if (ce->ce_flags & CE_MATCHED) {
326326
if (!ce_stage(ce))
327327
continue;

‎builtin/clean.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
221221
struct dir_entry *ent = dir.entries[i];
222222
int len, pos;
223223
int matches = 0;
224-
struct cache_entry *ce;
224+
const struct cache_entry *ce;
225225
struct stat st;
226226

227227
/*

‎builtin/commit.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ static int list_paths(struct string_list *list, const char *with_tree,
207207
}
208208

209209
for (i = 0; i < active_nr; i++) {
210-
struct cache_entry *ce = active_cache[i];
210+
const struct cache_entry *ce = active_cache[i];
211211
struct string_list_item *item;
212212

213213
if (ce->ce_flags & CE_UPDATE)

‎builtin/grep.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,7 @@ static int grep_cache(struct grep_opt *opt, const struct pathspec *pathspec, int
376376
read_cache();
377377

378378
for (nr = 0; nr < active_nr; nr++) {
379-
struct cache_entry *ce = active_cache[nr];
379+
const struct cache_entry *ce = active_cache[nr];
380380
if (!S_ISREG(ce->ce_mode))
381381
continue;
382382
if (!match_pathspec_depth(pathspec, ce->name, ce_namelen(ce), 0, NULL))

‎builtin/ls-files.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ static void show_killed_files(struct dir_struct *dir)
127127
}
128128
}
129129

130-
static void show_ce_entry(const char *tag, struct cache_entry *ce)
130+
static void show_ce_entry(const char *tag, const struct cache_entry *ce)
131131
{
132132
int len = max_prefix_len;
133133

@@ -165,7 +165,7 @@ static void show_ce_entry(const char *tag, struct cache_entry *ce)
165165
}
166166
write_name(ce->name, ce_namelen(ce));
167167
if (debug_mode) {
168-
struct stat_data *sd = &ce->ce_stat_data;
168+
const struct stat_data *sd = &ce->ce_stat_data;
169169

170170
printf(" ctime: %d:%d\n", sd->sd_ctime.sec, sd->sd_ctime.nsec);
171171
printf(" mtime: %d:%d\n", sd->sd_mtime.sec, sd->sd_mtime.nsec);
@@ -203,7 +203,7 @@ static void show_ru_info(void)
203203
}
204204
}
205205

206-
static int ce_excluded(struct dir_struct *dir, struct cache_entry *ce)
206+
static int ce_excluded(struct dir_struct *dir, const struct cache_entry *ce)
207207
{
208208
int dtype = ce_to_dtype(ce);
209209
return is_excluded(dir, ce->name, &dtype);
@@ -223,7 +223,7 @@ static void show_files(struct dir_struct *dir)
223223
}
224224
if (show_cached || show_stage) {
225225
for (i = 0; i < active_nr; i++) {
226-
struct cache_entry *ce = active_cache[i];
226+
const struct cache_entry *ce = active_cache[i];
227227
if ((dir->flags & DIR_SHOW_IGNORED) &&
228228
!ce_excluded(dir, ce))
229229
continue;
@@ -237,7 +237,7 @@ static void show_files(struct dir_struct *dir)
237237
}
238238
if (show_deleted || show_modified) {
239239
for (i = 0; i < active_nr; i++) {
240-
struct cache_entry *ce = active_cache[i];
240+
const struct cache_entry *ce = active_cache[i];
241241
struct stat st;
242242
int err;
243243
if ((dir->flags & DIR_SHOW_IGNORED) &&
@@ -273,7 +273,7 @@ static void prune_cache(const char *prefix)
273273
last = active_nr;
274274
while (last > first) {
275275
int next = (last + first) >> 1;
276-
struct cache_entry *ce = active_cache[next];
276+
const struct cache_entry *ce = active_cache[next];
277277
if (!strncmp(ce->name, prefix, max_prefix_len)) {
278278
first = next+1;
279279
continue;

‎builtin/merge-index.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ static int merge_entry(int pos, const char *path)
1616
die("git merge-index: %s not in the cache", path);
1717
found = 0;
1818
do {
19-
struct cache_entry *ce = active_cache[pos];
19+
const struct cache_entry *ce = active_cache[pos];
2020
int stage = ce_stage(ce);
2121

2222
if (strcmp(ce->name, path))
@@ -58,7 +58,7 @@ static void merge_all(void)
5858
{
5959
int i;
6060
for (i = 0; i < active_nr; i++) {
61-
struct cache_entry *ce = active_cache[i];
61+
const struct cache_entry *ce = active_cache[i];
6262
if (!ce_stage(ce))
6363
continue;
6464
i += merge_entry(i, ce->name)-1;

‎builtin/merge.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -903,7 +903,7 @@ static int suggest_conflicts(int renormalizing)
903903
die_errno(_("Could not open '%s' for writing"), filename);
904904
fprintf(fp, "\nConflicts:\n");
905905
for (pos = 0; pos < active_nr; pos++) {
906-
struct cache_entry *ce = active_cache[pos];
906+
const struct cache_entry *ce = active_cache[pos];
907907

908908
if (ce_stage(ce)) {
909909
fprintf(fp, "\t%s\n", ce->name);

‎builtin/rm.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ static int check_submodules_use_gitfiles(void)
6767
for (i = 0; i < list.nr; i++) {
6868
const char *name = list.entry[i].name;
6969
int pos;
70-
struct cache_entry *ce;
70+
const struct cache_entry *ce;
7171
struct stat st;
7272

7373
pos = cache_name_pos(name, strlen(name));
@@ -120,7 +120,7 @@ static int check_local_mod(unsigned char *head, int index_only)
120120
for (i = 0; i < list.nr; i++) {
121121
struct stat st;
122122
int pos;
123-
struct cache_entry *ce;
123+
const struct cache_entry *ce;
124124
const char *name = list.entry[i].name;
125125
unsigned char sha1[20];
126126
unsigned mode;
@@ -321,7 +321,7 @@ int cmd_rm(int argc, const char **argv, const char *prefix)
321321
seen = xcalloc(i, 1);
322322

323323
for (i = 0; i < active_nr; i++) {
324-
struct cache_entry *ce = active_cache[i];
324+
const struct cache_entry *ce = active_cache[i];
325325
if (!match_pathspec(pathspec, ce->name, ce_namelen(ce), 0, seen))
326326
continue;
327327
ALLOC_GROW(list.entry, list.nr + 1, list.alloc);

‎builtin/update-index.c‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ static int process_lstat_error(const char *path, int err)
8383
return error("lstat(\"%s\"): %s", path, strerror(errno));
8484
}
8585

86-
static int add_one_path(struct cache_entry *old, const char *path, int len, struct stat *st)
86+
static int add_one_path(const struct cache_entry *old, const char *path, int len, struct stat *st)
8787
{
8888
int option, size;
8989
struct cache_entry *ce;
@@ -142,7 +142,7 @@ static int process_directory(const char *path, int len, struct stat *st)
142142

143143
/* Exact match: file or existing gitlink */
144144
if (pos >= 0) {
145-
struct cache_entry *ce = active_cache[pos];
145+
const struct cache_entry *ce = active_cache[pos];
146146
if (S_ISGITLINK(ce->ce_mode)) {
147147

148148
/* Do nothing to the index if there is no HEAD! */
@@ -158,7 +158,7 @@ static int process_directory(const char *path, int len, struct stat *st)
158158
/* Inexact match: is there perhaps a subdirectory match? */
159159
pos = -pos-1;
160160
while (pos < active_nr) {
161-
struct cache_entry *ce = active_cache[pos++];
161+
const struct cache_entry *ce = active_cache[pos++];
162162

163163
if (strncmp(ce->name, path, len))
164164
break;
@@ -183,7 +183,7 @@ static int process_path(const char *path)
183183
{
184184
int pos, len;
185185
struct stat st;
186-
struct cache_entry *ce;
186+
const struct cache_entry *ce;
187187

188188
len = strlen(path);
189189
if (has_symlink_leading_path(path, len))
@@ -448,7 +448,7 @@ static int unresolve_one(const char *path)
448448
/* already merged */
449449
pos = unmerge_cache_entry_at(pos);
450450
if (pos < active_nr) {
451-
struct cache_entry *ce = active_cache[pos];
451+
const struct cache_entry *ce = active_cache[pos];
452452
if (ce_stage(ce) &&
453453
ce_namelen(ce) == namelen &&
454454
!memcmp(ce->name, path, namelen))
@@ -462,7 +462,7 @@ static int unresolve_one(const char *path)
462462
*/
463463
pos = -pos-1;
464464
if (pos < active_nr) {
465-
struct cache_entry *ce = active_cache[pos];
465+
const struct cache_entry *ce = active_cache[pos];
466466
if (ce_namelen(ce) == namelen &&
467467
!memcmp(ce->name, path, namelen)) {
468468
fprintf(stderr,
@@ -558,7 +558,7 @@ static int do_reupdate(int ac, const char **av,
558558
has_head = 0;
559559
redo:
560560
for (pos = 0; pos < active_nr; pos++) {
561-
struct cache_entry *ce = active_cache[pos];
561+
const struct cache_entry *ce = active_cache[pos];
562562
struct cache_entry *old = NULL;
563563
int save_nr;
564564

0 commit comments

Comments
 (0)