From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-2.7 required=3.0 tests=AWL,BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD shortcircuit=no autolearn=no autolearn_force=no version=3.4.0 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id 0ABB01FADF for ; Wed, 10 Jan 2018 09:37:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964950AbeAJJhO (ORCPT ); Wed, 10 Jan 2018 04:37:14 -0500 Received: from a7-11.smtp-out.eu-west-1.amazonses.com ([54.240.7.11]:48814 "EHLO a7-11.smtp-out.eu-west-1.amazonses.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756099AbeAJJgn (ORCPT ); Wed, 10 Jan 2018 04:36:43 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=shh3fegwg5fppqsuzphvschd53n6ihuv; d=amazonses.com; t=1515577001; h=From:To:Message-ID:In-Reply-To:References:Subject:MIME-Version:Content-Type:Content-Transfer-Encoding:Date:Feedback-ID; bh=uQATx4ZlMPPUaz4+uOTPP3cGH4LLhXlMJaQ3wz9+hL8=; b=EIsjrz47LpSJT6YEYCwPtbUmjbqABrKJ0zgLQNW8ZDgicN3nG3CJpktv2Luil5Dy jfnyQz9vr86RQNTj3S2fk9El+z8ugq7QSqZKkc1QzyZU/NvhD/is29CM0L1zjgvkMEf 6mmfh87rZp3GW3kbIxt/iuPK44W9YqBtCRZ+N1yg= From: Olga Telezhnaya To: git@vger.kernel.org Message-ID: <01020160df6dc5d5-9b4c7836-9762-4055-a8a4-0b65fa0de9de-000000@eu-west-1.amazonses.com> In-Reply-To: <01020160df6dc499-0e6d11ec-1dcd-4a71-997b-ea231f33fae4-000000@eu-west-1.amazonses.com> References: <01020160df6dc499-0e6d11ec-1dcd-4a71-997b-ea231f33fae4-000000@eu-west-1.amazonses.com> Subject: [PATCH v2 18/18] ref-filter: make cat_file_info independent MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Date: Wed, 10 Jan 2018 09:36:41 +0000 X-SES-Outgoing: 2018.01.10-54.240.7.11 Feedback-ID: 1.eu-west-1.YYPRFFOog89kHDDPKvTu4MK67j4wW0z7cAgZtFqQH58=:AmazonSES Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Remove connection between expand_data variable in cat-file and in ref-filter. It will help further to get rid of using expand_data in cat-file. Signed-off-by: Olga Telezhnaia Mentored-by: Christian Couder Mentored by: Jeff King --- builtin/cat-file.c | 2 +- ref-filter.c | 28 ++++++++++++++-------------- ref-filter.h | 1 - 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/builtin/cat-file.c b/builtin/cat-file.c index 19cee0d22fabe..ffa8e61213e36 100644 --- a/builtin/cat-file.c +++ b/builtin/cat-file.c @@ -289,6 +289,7 @@ static void batch_object_write(const char *obj_name, struct batch_options *opt, item.start_of_request = obj_name; if (populate_value(&item)) return; + data->type = item.type; strbuf_expand(&buf, opt->format->format, expand_format, &item); strbuf_addch(&buf, '\n'); @@ -392,7 +393,6 @@ static int batch_objects(struct batch_options *opt) * object. */ memset(&data, 0, sizeof(data)); - opt->format->cat_file_data = &data; opt->format->is_cat = 1; opt->format->split_on_whitespace = &data.split_on_whitespace; opt->format->all_objects = opt->all_objects; diff --git a/ref-filter.c b/ref-filter.c index 83bacdd8bdd78..aee6be32f53ef 100644 --- a/ref-filter.c +++ b/ref-filter.c @@ -100,7 +100,7 @@ static struct used_atom { } u; } *used_atom; static int used_atom_cnt, need_tagged, need_symref; -struct expand_data *cat_file_info; +struct expand_data cat_file_info; static int is_cat = 0; static void color_atom_parser(const struct ref_format *format, struct used_atom *atom, const char *color_value) @@ -256,9 +256,9 @@ static void objectname_atom_parser(const struct ref_format *format, struct used_ static void objectsize_atom_parser(const struct ref_format *format, struct used_atom *atom, const char *arg) { if (!arg) - cat_file_info->info.sizep = &cat_file_info->size; + cat_file_info.info.sizep = &cat_file_info.size; else if (!strcmp(arg, "disk")) - cat_file_info->info.disk_sizep = &cat_file_info->disk_size; + cat_file_info.info.disk_sizep = &cat_file_info.disk_size; else die(_("urecognized %%(objectsize) argument: %s"), arg); } @@ -266,7 +266,7 @@ static void objectsize_atom_parser(const struct ref_format *format, struct used_ static void objecttype_atom_parser(const struct ref_format *format, struct used_atom *atom, const char *arg) { if (!arg) - cat_file_info->info.typep = &cat_file_info->type; + cat_file_info.info.typep = &cat_file_info.type; else die(_("urecognized %%(objecttype) argument: %s"), arg); } @@ -274,7 +274,7 @@ static void objecttype_atom_parser(const struct ref_format *format, struct used_ static void deltabase_atom_parser(const struct ref_format *format, struct used_atom *atom, const char *arg) { if (!arg) - cat_file_info->info.delta_base_sha1 = cat_file_info->delta_base_oid.hash; + cat_file_info.info.delta_base_sha1 = cat_file_info.delta_base_oid.hash; else die(_("urecognized %%(deltabase) argument: %s"), arg); } @@ -739,7 +739,6 @@ int verify_ref_format(struct ref_format *format) { const char *cp, *sp; - cat_file_info = format->cat_file_data; is_cat = format->is_cat; format->need_color_reset_at_eol = 0; for (cp = format->format; *cp && (sp = find_next(cp)); ) { @@ -766,8 +765,8 @@ int verify_ref_format(struct ref_format *format) format->need_color_reset_at_eol = 0; if (is_cat && format->all_objects) { struct object_info empty = OBJECT_INFO_INIT; - if (!memcmp(&cat_file_info->info, &empty, sizeof(empty))) - cat_file_info->skip_object_info = 1; + if (!memcmp(&cat_file_info.info, &empty, sizeof(empty))) + cat_file_info.skip_object_info = 1; } return 0; } @@ -1472,18 +1471,19 @@ int populate_value(struct ref_array_item *ref) } if (is_cat) { - if (!cat_file_info->skip_object_info && - sha1_object_info_extended(ref->objectname.hash, &cat_file_info->info, + if (!cat_file_info.info.typep) cat_file_info.info.typep = &cat_file_info.type; + if (!cat_file_info.skip_object_info && + sha1_object_info_extended(ref->objectname.hash, &cat_file_info.info, OBJECT_INFO_LOOKUP_REPLACE) < 0) { const char *e = ref->start_of_request; printf("%s missing\n", e ? e : oid_to_hex(&ref->objectname)); fflush(stdout); return -1; } - ref->type = cat_file_info->type; - ref->size = cat_file_info->size; - ref->disk_size = cat_file_info->disk_size; - ref->delta_base_oid = cat_file_info->delta_base_oid; + ref->type = cat_file_info.type; + ref->size = cat_file_info.size; + ref->disk_size = cat_file_info.disk_size; + ref->delta_base_oid = cat_file_info.delta_base_oid; } /* Fill in specials first */ diff --git a/ref-filter.h b/ref-filter.h index e588d1f50eef6..d3e0cbdd4ce6d 100644 --- a/ref-filter.h +++ b/ref-filter.h @@ -125,7 +125,6 @@ struct ref_format { * Helps to move all formatting logic from cat-file to ref-filter, * hopefully would be reduced later. */ - struct expand_data *cat_file_data; int is_cat; int *split_on_whitespace; int all_objects; -- https://github.com/git/git/pull/450