From: Olga Telezhnaya <olyatelezhnaya@gmail.com> To: git@vger.kernel.org Subject: [PATCH 13/20] cat-file: start use ref_array_item struct Date: Tue, 9 Jan 2018 13:05:23 +0000 [thread overview] Message-ID: <01020160db067baa-645d1cd7-0fa5-404e-b3f0-afba7dac7d18-000000@eu-west-1.amazonses.com> (raw) In-Reply-To: <01020160db0679c9-799a0bc4-b6d1-43e2-ad3b-80be4e4c55e9-000000@eu-west-1.amazonses.com> Moving from using expand_data to ref_array_item structure. That helps us to reuse functions from ref-filter easier. Signed-off-by: Olga Telezhnaia <olyatelezhnaya@gmail.com> Mentored-by: Christian Couder <christian.couder@gmail.com> Mentored by: Jeff King <peff@peff.net> --- builtin/cat-file.c | 30 +++++++++++++++++++----------- ref-filter.h | 5 +++++ 2 files changed, 24 insertions(+), 11 deletions(-) diff --git a/builtin/cat-file.c b/builtin/cat-file.c index 1f331559e55c7..1c92194faaede 100644 --- a/builtin/cat-file.c +++ b/builtin/cat-file.c @@ -183,26 +183,26 @@ static int is_atom(const char *atom, const char *s, int slen) } static void expand_atom(struct strbuf *sb, const char *atom, int len, - struct expand_data *data) + struct ref_array_item *item) { if (is_atom("objectname", atom, len)) - strbuf_addstr(sb, oid_to_hex(&data->oid)); + strbuf_addstr(sb, oid_to_hex(&item->objectname)); else if (is_atom("objecttype", atom, len)) - strbuf_addstr(sb, typename(data->type)); + strbuf_addstr(sb, typename(item->type)); else if (is_atom("objectsize", atom, len)) - strbuf_addf(sb, "%lu", data->size); + strbuf_addf(sb, "%lu", item->size); else if (is_atom("objectsize:disk", atom, len)) - strbuf_addf(sb, "%"PRIuMAX, (uintmax_t)data->disk_size); + strbuf_addf(sb, "%"PRIuMAX, (uintmax_t)item->disk_size); else if (is_atom("rest", atom, len)) - strbuf_addstr(sb, data->rest); + strbuf_addstr(sb, item->rest); else if (is_atom("deltabase", atom, len)) - strbuf_addstr(sb, oid_to_hex(&data->delta_base_oid)); + strbuf_addstr(sb, oid_to_hex(&item->delta_base_oid)); } -static size_t expand_format(struct strbuf *sb, const char *start, void *vdata) +static size_t expand_format(struct strbuf *sb, const char *start, void *data) { const char *end; - struct expand_data *data = vdata; + struct ref_array_item *item = data; if (*start != '(') return 0; @@ -210,7 +210,7 @@ static size_t expand_format(struct strbuf *sb, const char *start, void *vdata) if (!end) die("format element '%s' does not end in ')'", start); - expand_atom(sb, start + 1, end - start - 1, data); + expand_atom(sb, start + 1, end - start - 1, item); return end - start + 1; } @@ -282,6 +282,7 @@ static void batch_object_write(const char *obj_name, struct batch_options *opt, struct expand_data *data) { struct strbuf buf = STRBUF_INIT; + struct ref_array_item item; if (!data->skip_object_info && sha1_object_info_extended(data->oid.hash, &data->info, @@ -292,7 +293,14 @@ static void batch_object_write(const char *obj_name, struct batch_options *opt, return; } - strbuf_expand(&buf, opt->format->format, expand_format, data); + item.objectname = data->oid; + item.type = data->type; + item.size = data->size; + item.disk_size = data->disk_size; + item.rest = data->rest; + item.delta_base_oid = data->delta_base_oid; + + strbuf_expand(&buf, opt->format->format, expand_format, &item); strbuf_addch(&buf, '\n'); batch_write(opt, buf.buf, buf.len); strbuf_release(&buf); diff --git a/ref-filter.h b/ref-filter.h index de3fd3263ac64..28774e8e0f771 100644 --- a/ref-filter.h +++ b/ref-filter.h @@ -40,6 +40,11 @@ struct ref_array_item { const char *symref; struct commit *commit; struct atom_value *values; + enum object_type type; + unsigned long size; + off_t disk_size; + const char *rest; + struct object_id delta_base_oid; char refname[FLEX_ARRAY]; }; -- https://github.com/git/git/pull/450
next prev parent reply other threads:[~2018-01-09 13:06 UTC|newest] Thread overview: 71+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-01-09 13:05 [PATCH 01/20] cat-file: split expand_atom into 2 functions Olga Telezhnaya 2018-01-09 13:05 ` [PATCH 14/20] cat-file: make populate_value global Olga Telezhnaya 2018-01-09 13:05 ` [PATCH 04/20] cat-file: make valid_atoms as a function parameter Olga Telezhnaya 2018-01-09 22:16 ` Junio C Hamano 2018-01-09 13:05 ` [PATCH 10/20] cat-file: simplify expand_atom function Olga Telezhnaya 2018-01-09 13:05 ` [PATCH 18/20] cat-file: add split_on_whitespace flag Olga Telezhnaya 2018-01-09 13:05 ` [PATCH 20/20] cat-file: make cat_file_info variable independent Olga Telezhnaya 2018-01-09 13:05 ` [PATCH 15/20] cat-file: start reusing populate_value Olga Telezhnaya 2018-01-09 13:05 ` [PATCH 07/20] cat-file: reuse parse_ref_filter_atom Olga Telezhnaya 2018-01-09 23:32 ` Junio C Hamano 2018-01-09 13:05 ` [PATCH 17/20] cat-file: add is_cat flag in ref-filter Olga Telezhnaya 2018-01-09 13:05 ` Olga Telezhnaya [this message] 2018-01-09 13:05 ` [PATCH 02/20] cat-file: reuse struct ref_format Olga Telezhnaya 2018-01-09 13:05 ` [PATCH 09/20] cat-file: get rid of goto in ref-filter Olga Telezhnaya 2018-01-09 13:05 ` [PATCH 05/20] cat-file: move struct expand_data into ref-filter Olga Telezhnaya 2018-01-09 13:05 ` [PATCH 19/20] cat-file: move skip_object_info " Olga Telezhnaya 2018-01-09 13:05 ` [PATCH 16/20] cat-file: get rid of expand_atom_into_fields Olga Telezhnaya 2018-01-09 13:05 ` [PATCH 08/20] cat-file: remove unused code Olga Telezhnaya 2018-01-09 13:05 ` [PATCH 11/20] cat-file: get rid of duplicate checking Olga Telezhnaya 2018-01-09 13:05 ` [PATCH 03/20] cat-file: rename variables in ref-filter Olga Telezhnaya 2018-01-09 22:04 ` Junio C Hamano 2018-01-10 7:07 ` Оля Тележная 2018-01-09 13:05 ` [PATCH 12/20] cat-file: rename variable " Olga Telezhnaya 2018-01-09 13:05 ` [PATCH 06/20] cat-file: start migrating to ref-filter Olga Telezhnaya 2018-01-10 9:36 ` [PATCH v2 01/18] cat-file: split expand_atom into 2 functions Olga Telezhnaya 2018-01-10 9:36 ` [PATCH v2 08/18] ref-filter: get rid of goto Olga Telezhnaya 2018-01-10 9:36 ` [PATCH v2 06/18] ref-filter: reuse parse_ref_filter_atom Olga Telezhnaya 2018-01-10 9:36 ` [PATCH v2 13/18] cat-file: start reusing populate_value Olga Telezhnaya 2018-01-10 9:36 ` [PATCH v2 10/18] cat-file: get rid of duplicate checking Olga Telezhnaya 2018-01-10 9:36 ` [PATCH v2 05/18] cat-file: start migrating to ref-filter Olga Telezhnaya 2018-01-10 9:36 ` [PATCH v2 14/18] ref-filter: get rid of expand_atom_into_fields Olga Telezhnaya 2018-01-10 9:36 ` [PATCH v2 09/18] cat-file: simplify expand_atom function Olga Telezhnaya 2018-01-10 9:36 ` [PATCH v2 03/18] ref-filter: make valid_atom as function parameter Olga Telezhnaya 2018-01-15 21:42 ` Jeff King 2018-01-16 6:55 ` Оля Тележная 2018-01-17 21:43 ` Jeff King 2018-01-17 22:39 ` Christian Couder 2018-01-18 6:20 ` Оля Тележная 2018-01-18 11:49 ` Оля Тележная 2018-01-18 14:23 ` Christian Couder 2018-01-19 12:24 ` Оля Тележная 2018-01-19 15:48 ` Christian Couder 2018-01-19 17:14 ` Christian Couder 2018-01-19 17:22 ` Оля Тележная 2018-01-19 17:57 ` Christian Couder 2018-01-19 17:23 ` Jeff King 2018-01-19 17:31 ` Christian Couder 2018-01-19 18:47 ` Junio C Hamano 2018-01-19 20:12 ` Jeff King 2018-01-10 9:36 ` [PATCH v2 11/18] cat-file: start use ref_array_item struct Olga Telezhnaya 2018-01-10 9:36 ` [PATCH v2 17/18] cat-file: move skip_object_info into ref-filter Olga Telezhnaya 2018-01-10 9:36 ` [PATCH v2 07/18] cat-file: remove unused code Olga Telezhnaya 2018-01-10 9:36 ` [PATCH v2 02/18] cat-file: reuse struct ref_format Olga Telezhnaya 2018-01-15 21:37 ` Jeff King 2018-01-16 9:45 ` Оля Тележная 2018-01-10 9:36 ` [PATCH v2 16/18] ref_format: add split_on_whitespace flag Olga Telezhnaya 2018-01-10 9:36 ` [PATCH v2 18/18] ref-filter: make cat_file_info independent Olga Telezhnaya 2018-01-10 9:36 ` [PATCH v2 15/18] ref-filter: add is_cat flag Olga Telezhnaya 2018-01-10 9:36 ` [PATCH v2 04/18] cat-file: move struct expand_data into ref-filter Olga Telezhnaya 2018-01-15 21:44 ` Jeff King 2018-01-16 7:00 ` Оля Тележная 2018-01-17 21:45 ` Jeff King 2018-01-18 5:56 ` Оля Тележная 2018-01-10 9:36 ` [PATCH v2 12/18] ref-filter: make populate_value global Olga Telezhnaya 2018-01-15 21:33 ` [PATCH v2 01/18] cat-file: split expand_atom into 2 functions Jeff King 2018-01-15 22:09 ` Jeff King 2018-01-16 7:22 ` Оля Тележная 2018-01-17 21:49 ` Jeff King 2018-01-17 23:04 ` Christian Couder 2018-01-18 6:22 ` Оля Тележная 2018-01-18 8:45 ` Christian Couder
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style List information: http://vger.kernel.org/majordomo-info.html * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=01020160db067baa-645d1cd7-0fa5-404e-b3f0-afba7dac7d18-000000@eu-west-1.amazonses.com \ --to=olyatelezhnaya@gmail.com \ --cc=git@vger.kernel.org \ --subject='Re: [PATCH 13/20] cat-file: start use ref_array_item struct' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
Code repositories for project(s) associated with this inbox: https://80x24.org/mirrors/git.git This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).