kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

for-each-ref: rename 'refinfo' to 'ref_array_item' 

Rename 'refinfo' to 'ref_array_item' as a preparatory step for
introduction of new structures in the forthcoming patch.

Re-order the fields in 'ref_array_item' so that refname can be
eventually converted to a FLEX_ARRAY.

Mentored-by: Christian Couder <christian.couder@gmail.com>
Mentored-by: Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Signed-off-by: Karthik Nayak <karthik.188@gmail.com>
Reviewed-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Karthik Nayak 2015-06-14 01:07:21 +05:30 committed by Junio C Hamano
parent fc80edcae1
commit 5879232090
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
builtin/for-each-ref.c
View File

@ -31,12 +31,12 @@ struct ref_sort {
unsigned reverse : 1; unsigned reverse : 1;
}; };


struct refinfo { struct ref_array_item {
char *refname;
unsigned char objectname[20]; unsigned char objectname[20];
int flag; int flag;
const char *symref; const char *symref;
struct atom_value *value; struct atom_value *value;
char *refname;
}; };


static struct { static struct {
@ -86,7 +86,7 @@ static struct {
* a "*" to denote deref_tag(). * a "*" to denote deref_tag().
* *
* We parse given format string and sort specifiers, and make a list * We parse given format string and sort specifiers, and make a list
* of properties that we need to extract out of objects. refinfo * of properties that we need to extract out of objects. ref_array_item
* structure will hold an array of values extracted that can be * structure will hold an array of values extracted that can be
* indexed with the "atom number", which is an index into this * indexed with the "atom number", which is an index into this
* array. * array.
@ -623,7 +623,7 @@ static inline char *copy_advance(char *dst, const char *src)
/* /*
* Parse the object referred by ref, and grab needed value. * Parse the object referred by ref, and grab needed value.
*/ */
static void populate_value(struct refinfo *ref) static void populate_value(struct ref_array_item *ref)
{ {
void *buf; void *buf;
struct object *obj; struct object *obj;
@ -835,7 +835,7 @@ static void populate_value(struct refinfo *ref)
* Given a ref, return the value for the atom. This lazily gets value * Given a ref, return the value for the atom. This lazily gets value
* out of the object by calling populate value. * out of the object by calling populate value.
*/ */
static void get_value(struct refinfo *ref, int atom, struct atom_value **v) static void get_value(struct ref_array_item *ref, int atom, struct atom_value **v)
{ {
if (!ref->value) { if (!ref->value) {
populate_value(ref); populate_value(ref);
@ -845,7 +845,7 @@ static void get_value(struct refinfo *ref, int atom, struct atom_value **v)
} }


struct grab_ref_cbdata { struct grab_ref_cbdata {
struct refinfo **grab_array; struct ref_array_item **grab_array;
const char **grab_pattern; const char **grab_pattern;
int grab_cnt; int grab_cnt;
}; };
@ -875,12 +875,12 @@ static int match_name_as_path(const char **pattern, const char *refname)
return 0; return 0;
} }


/* Allocate space for a new refinfo and copy the objectname and flag to it */ /* Allocate space for a new ref_array_item and copy the objectname and flag to it */
static struct refinfo *new_refinfo(const char *refname, static struct ref_array_item *new_ref_array_item(const char *refname,
const unsigned char *objectname, const unsigned char *objectname,
int flag) int flag)
{ {
struct refinfo *ref = xcalloc(1, sizeof(struct refinfo)); struct ref_array_item *ref = xcalloc(1, sizeof(struct ref_array_item));
ref->refname = xstrdup(refname); ref->refname = xstrdup(refname);
hashcpy(ref->objectname, objectname); hashcpy(ref->objectname, objectname);
ref->flag = flag; ref->flag = flag;
@ -896,7 +896,7 @@ static int grab_single_ref(const char *refname, const struct object_id *oid,
int flag, void *cb_data) int flag, void *cb_data)
{ {
struct grab_ref_cbdata *cb = cb_data; struct grab_ref_cbdata *cb = cb_data;
struct refinfo *ref; struct ref_array_item *ref;


if (flag & REF_BAD_NAME) { if (flag & REF_BAD_NAME) {
warning("ignoring ref with broken name %s", refname); warning("ignoring ref with broken name %s", refname);
@ -911,14 +911,14 @@ static int grab_single_ref(const char *refname, const struct object_id *oid,
* to do its job and the resulting list may yet to be pruned * to do its job and the resulting list may yet to be pruned
* by maxcount logic. * by maxcount logic.
*/ */
ref = new_refinfo(refname, oid->hash, flag); ref = new_ref_array_item(refname, oid->hash, flag);


REALLOC_ARRAY(cb->grab_array, cb->grab_cnt + 1); REALLOC_ARRAY(cb->grab_array, cb->grab_cnt + 1);
cb->grab_array[cb->grab_cnt++] = ref; cb->grab_array[cb->grab_cnt++] = ref;
return 0; return 0;
} }


static int cmp_ref_sort(struct ref_sort *s, struct refinfo *a, struct refinfo *b) static int cmp_ref_sort(struct ref_sort *s, struct ref_array_item *a, struct ref_array_item *b)
{ {
struct atom_value *va, *vb; struct atom_value *va, *vb;
int cmp; int cmp;
@ -945,8 +945,8 @@ static int cmp_ref_sort(struct ref_sort *s, struct refinfo *a, struct refinfo *b
static struct ref_sort *ref_sort; static struct ref_sort *ref_sort;
static int compare_refs(const void *a_, const void *b_) static int compare_refs(const void *a_, const void *b_)
{ {
struct refinfo *a = *((struct refinfo **)a_); struct ref_array_item *a = *((struct ref_array_item **)a_);
struct refinfo *b = *((struct refinfo **)b_); struct ref_array_item *b = *((struct ref_array_item **)b_);
struct ref_sort *s; struct ref_sort *s;


for (s = ref_sort; s; s = s->next) { for (s = ref_sort; s; s = s->next) {
@ -957,10 +957,10 @@ static int compare_refs(const void *a_, const void *b_)
return 0; return 0;
} }


static void sort_refs(struct ref_sort *sort, struct refinfo **refs, int num_refs) static void sort_refs(struct ref_sort *sort, struct ref_array_item **refs, int num_refs)
{ {
ref_sort = sort; ref_sort = sort;
qsort(refs, num_refs, sizeof(struct refinfo *), compare_refs); qsort(refs, num_refs, sizeof(struct ref_array_item *), compare_refs);
} }


static void print_value(struct atom_value *v, int quote_style) static void print_value(struct atom_value *v, int quote_style)
@ -1027,7 +1027,7 @@ static void emit(const char *cp, const char *ep)
} }
} }


static void show_ref(struct refinfo *info, const char *format, int quote_style) static void show_ref(struct ref_array_item *info, const char *format, int quote_style)
{ {
const char *cp, *sp, *ep; const char *cp, *sp, *ep;


@ -1100,7 +1100,7 @@ int cmd_for_each_ref(int argc, const char **argv, const char *prefix)
const char *format = "%(objectname) %(objecttype)\t%(refname)"; const char *format = "%(objectname) %(objecttype)\t%(refname)";
struct ref_sort *sort = NULL, **sort_tail = &sort; struct ref_sort *sort = NULL, **sort_tail = &sort;
int maxcount = 0, quote_style = 0; int maxcount = 0, quote_style = 0;
struct refinfo **refs; struct ref_array_item **refs;
struct grab_ref_cbdata cbdata; struct grab_ref_cbdata cbdata;


struct option opts[] = { struct option opts[] = {