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 C58A31F406 for ; Tue, 9 Jan 2018 13:06:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757221AbeAINGF (ORCPT ); Tue, 9 Jan 2018 08:06:05 -0500 Received: from a7-17.smtp-out.eu-west-1.amazonses.com ([54.240.7.17]:38564 "EHLO a7-17.smtp-out.eu-west-1.amazonses.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756992AbeAINFZ (ORCPT ); Tue, 9 Jan 2018 08:05:25 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=shh3fegwg5fppqsuzphvschd53n6ihuv; d=amazonses.com; t=1515503123; h=From:To:Message-ID:In-Reply-To:References:Subject:MIME-Version:Content-Type:Content-Transfer-Encoding:Date:Feedback-ID; bh=eiYmdPy2AYf3LKpKj1ErAL8Nwy8TCHcHvgJHFKhoky4=; b=HMpn8v4vsBJM3Intn5s5UNGov9d9uuZCtM1ssB3cwOC0S+CEC42UMMeMKLA+06ll CqKK0pvawXrWp++XOm6KhhIhWIyg7pwMMFAAz8mTnSIIz1FS9wUz8Wfe3UX4qsiGDJQ 5wz/hKNJA2ZiJJtLruYxZoHFr33WjQ7W3TnrGvH8= From: Olga Telezhnaya To: git@vger.kernel.org Message-ID: <01020160db067b4f-60d6012f-7cb8-4ba2-891f-1d1ed5bb5786-000000@eu-west-1.amazonses.com> In-Reply-To: <01020160db0679c9-799a0bc4-b6d1-43e2-ad3b-80be4e4c55e9-000000@eu-west-1.amazonses.com> References: <01020160db0679c9-799a0bc4-b6d1-43e2-ad3b-80be4e4c55e9-000000@eu-west-1.amazonses.com> Subject: [PATCH 07/20] cat-file: reuse parse_ref_filter_atom MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Date: Tue, 9 Jan 2018 13:05:23 +0000 X-SES-Outgoing: 2018.01.09-54.240.7.17 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 Continue migrating formatting logic from cat-file to ref-filter. Reuse parse_ref_filter_atom for unifying all processes in ref-filter and further reducing of expand_atom_into_fields function. Signed-off-by: Olga Telezhnaia Mentored-by: Christian Couder Mentored by: Jeff King --- ref-filter.c | 73 +++++++++++++++++++++++++++++++++++++----------------------- 1 file changed, 45 insertions(+), 28 deletions(-) diff --git a/ref-filter.c b/ref-filter.c index 98bb10185ae96..2bd9a8fc4e39c 100644 --- a/ref-filter.c +++ b/ref-filter.c @@ -100,6 +100,7 @@ static struct used_atom { } u; } *used_atoms; static int used_atom_cnt, need_tagged, need_symref; +struct expand_data *cat_file_info; static void color_atom_parser(const struct ref_format *format, struct used_atom *atom, const char *color_value) { @@ -251,6 +252,16 @@ static void objectname_atom_parser(const struct ref_format *format, struct used_ die(_("unrecognized %%(objectname) argument: %s"), arg); } +static void objectsize_atom_parser(const struct ref_format *format, struct used_atom *atom, const char *arg) +{ + if (!arg) + ; /* default to normal object size */ + else if (!strcmp(arg, "disk")) + cat_file_info->info.disk_sizep = &cat_file_info->disk_size; + else + die(_("urecognized %%(objectsize) argument: %s"), arg); +} + static void refname_atom_parser(const struct ref_format *format, struct used_atom *atom, const char *arg) { refname_atom_parser_internal(&atom->u.refname, arg, atom->name); @@ -371,6 +382,14 @@ static struct valid_atom { { "else" }, }; +static struct valid_atom valid_cat_file_atoms[] = { + { "objectname" }, + { "objecttype" }, + { "objectsize", FIELD_ULONG, objectsize_atom_parser }, + { "rest" }, + { "deltabase" }, +}; + #define REF_FORMATTING_STATE_INIT { 0, NULL } struct ref_formatting_stack { @@ -392,6 +411,25 @@ struct atom_value { struct used_atom *atom; }; +static int is_atom(const char *atom, const char *s, int slen) +{ + int alen = strlen(atom); + return alen == slen && !memcmp(atom, s, alen); +} + +static void expand_atom_into_fields(const char *atom, int len, + struct expand_data *data) +{ + if (is_atom("objecttype", atom, len)) + data->info.typep = &data->type; + else if (is_atom("objectsize", atom, len)) + data->info.sizep = &data->size; + else if (is_atom("rest", atom, len)) + data->split_on_whitespace = 1; + else if (is_atom("deltabase", atom, len)) + data->info.delta_base_sha1 = data->delta_base_oid.hash; +} + /* * Used to parse format string and sort specifiers */ @@ -458,6 +496,8 @@ static int parse_ref_filter_atom(const struct ref_format *format, need_tagged = 1; if (!strcmp(valid_atoms[i].name, "symref")) need_symref = 1; + if (cat_file_info) + expand_atom_into_fields(atom, atom_len, cat_file_info); return at; } @@ -693,31 +733,6 @@ static const char *find_next(const char *cp) return NULL; } -static int is_atom(const char *atom, const char *s, int slen) -{ - int alen = strlen(atom); - return alen == slen && !memcmp(atom, s, alen); -} - -static void expand_atom_into_fields(const char *atom, int len, - struct expand_data *data) -{ - if (is_atom("objectname", atom, len)) - ; /* do nothing */ - else if (is_atom("objecttype", atom, len)) - data->info.typep = &data->type; - else if (is_atom("objectsize", atom, len)) - data->info.sizep = &data->size; - else if (is_atom("objectsize:disk", atom, len)) - data->info.disk_sizep = &data->disk_size; - else if (is_atom("rest", atom, len)) - data->split_on_whitespace = 1; - else if (is_atom("deltabase", atom, len)) - data->info.delta_base_sha1 = data->delta_base_oid.hash; - else - die("unknown format element: %.*s", len, atom); -} - /* * Make sure the format string is well formed, and parse out * the used atoms. @@ -726,6 +741,7 @@ int verify_ref_format(struct ref_format *format) { const char *cp, *sp; + cat_file_info = format->cat_file_data; format->need_color_reset_at_eol = 0; for (cp = format->format; *cp && (sp = find_next(cp)); ) { const char *color, *ep = strchr(sp, ')'); @@ -736,9 +752,10 @@ int verify_ref_format(struct ref_format *format) /* sp points at "%(" and ep points at the closing ")" */ if (format->cat_file_data) - expand_atom_into_fields(sp + 2, ep - sp - 2, - format->cat_file_data); - else + { + at = parse_ref_filter_atom(format, valid_cat_file_atoms, + ARRAY_SIZE(valid_cat_file_atoms), sp + 2, ep); + } else { at = parse_ref_filter_atom(format, valid_atoms, ARRAY_SIZE(valid_atoms), sp + 2, ep); -- https://github.com/git/git/pull/450