Rename variable for easier reading. It points not to values, but to arrays. Added "s" ending so that it could be obvious. Signed-off-by: Olga Telezhnaia <olyatelezhnaya@xxxxxxxxx> Mentored-by: Christian Couder <christian.couder@xxxxxxxxx> Mentored by: Jeff King <peff@xxxxxxxx> --- ref-filter.c | 16 ++++++++-------- ref-filter.h | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ref-filter.c b/ref-filter.c index 1b8c8787190a9..56d2687e07df9 100644 --- a/ref-filter.c +++ b/ref-filter.c @@ -1418,7 +1418,7 @@ static void need_object(struct ref_array_item *ref) { die(_("parse_object_buffer failed on %s for %s"), oid_to_hex(&ref->objectname), ref->refname); - grab_values(ref->value, 0, obj, buf, size); + grab_values(ref->values, 0, obj, buf, size); if (!eaten) free(buf); @@ -1448,7 +1448,7 @@ static void need_object(struct ref_array_item *ref) { if (!obj) die(_("parse_object_buffer failed on %s for %s"), oid_to_hex(tagged), ref->refname); - grab_values(ref->value, 1, obj, buf, size); + grab_values(ref->values, 1, obj, buf, size); if (!eaten) free(buf); } @@ -1460,7 +1460,7 @@ static void populate_value(struct ref_array_item *ref) { int i; - ref->value = xcalloc(used_atom_cnt, sizeof(struct atom_value)); + ref->values = xcalloc(used_atom_cnt, sizeof(struct atom_value)); if (need_symref && (ref->flag & REF_ISSYMREF) && !ref->symref) { ref->symref = resolve_refdup(ref->refname, RESOLVE_REF_READING, @@ -1473,7 +1473,7 @@ static void populate_value(struct ref_array_item *ref) for (i = 0; i < used_atom_cnt; i++) { struct used_atom *atom = &used_atoms[i]; const char *name = used_atoms[i].name; - struct atom_value *v = &ref->value[i]; + struct atom_value *v = &ref->values[i]; int deref = 0; const char *refname; struct branch *branch = NULL; @@ -1571,7 +1571,7 @@ static void populate_value(struct ref_array_item *ref) } for (i = 0; i < used_atom_cnt; i++) { - struct atom_value *v = &ref->value[i]; + struct atom_value *v = &ref->values[i]; if (v->s == NULL) { need_object(ref); break; @@ -1586,11 +1586,11 @@ static void populate_value(struct ref_array_item *ref) */ static void get_ref_atom_value(struct ref_array_item *ref, int atom, struct atom_value **v) { - if (!ref->value) { + if (!ref->values) { populate_value(ref); - fill_missing_values(ref->value); + fill_missing_values(ref->values); } - *v = &ref->value[atom]; + *v = &ref->values[atom]; } /* diff --git a/ref-filter.h b/ref-filter.h index 590a60ffe034d..de3fd3263ac64 100644 --- a/ref-filter.h +++ b/ref-filter.h @@ -39,7 +39,7 @@ struct ref_array_item { unsigned int kind; const char *symref; struct commit *commit; - struct atom_value *value; + struct atom_value *values; char refname[FLEX_ARRAY]; }; -- https://github.com/git/git/pull/450