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 33A2F1F576 for ; Mon, 12 Feb 2018 08:10:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933043AbeBLIKQ (ORCPT ); Mon, 12 Feb 2018 03:10:16 -0500 Received: from a7-19.smtp-out.eu-west-1.amazonses.com ([54.240.7.19]:58616 "EHLO a7-19.smtp-out.eu-west-1.amazonses.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932983AbeBLIIz (ORCPT ); Mon, 12 Feb 2018 03:08:55 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=shh3fegwg5fppqsuzphvschd53n6ihuv; d=amazonses.com; t=1518422934; h=From:To:Message-ID:In-Reply-To:References:Subject:MIME-Version:Content-Type:Content-Transfer-Encoding:Date:Feedback-ID; bh=++A4bicrHp3dIDXN+vcLkpe96dJYdn4C8lC6xYo6IJw=; b=g6/Dg/1mpnIPS8jL53QHogi6JbNflSLUyZXIJPdS28A+2HtY40US+0HYkdRoNRXJ IkWvYz/1Zp9KfRHsSf/bbVpMBWapOcqorCYBtFG2F1HlylX4s5cv0Gg0dWGmgU8Op5O ofB6UPETCLHa5S1zmlg9idOCuqC2LCMi+5CGNLHM= From: Olga Telezhnaya To: git@vger.kernel.org Message-ID: <01020161890f433d-ba3260aa-b9e5-47d0-8e80-46ccf9f8c60f-000000@eu-west-1.amazonses.com> In-Reply-To: <01020161890f4236-47989eb4-c19f-4282-9084-9d4f90c2ebeb-000000@eu-west-1.amazonses.com> References: <01020161890f4236-47989eb4-c19f-4282-9084-9d4f90c2ebeb-000000@eu-west-1.amazonses.com> Subject: [PATCH v3 06/23] cat-file: split expand_atom() into 2 functions MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Date: Mon, 12 Feb 2018 08:08:54 +0000 X-SES-Outgoing: 2018.02.12-54.240.7.19 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 Split expand_atom() into 2 different functions, mark_atom_in_object_info() prepares variable for further filling, (new) expand_atom() creates resulting string. Need that for further reusing of formatting logic from ref-filter. Both functions will be step-by-step removed by the end of this patch. Signed-off-by: Olga Telezhnaia Mentored-by: Christian Couder Mentored by: Jeff King --- builtin/cat-file.c | 73 ++++++++++++++++++++++++++++-------------------------- 1 file changed, 38 insertions(+), 35 deletions(-) diff --git a/builtin/cat-file.c b/builtin/cat-file.c index 37d6096d201b5..edb04a96d9bd3 100644 --- a/builtin/cat-file.c +++ b/builtin/cat-file.c @@ -182,47 +182,47 @@ static int is_atom(const char *atom, const char *s, int slen) return alen == slen && !memcmp(atom, s, alen); } -static void expand_atom(struct strbuf *sb, const char *atom, int len, - void *vdata) +static void mark_atom_in_object_info(const char *atom, int len, + struct expand_data *data) { - struct expand_data *data = vdata; + 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); +} - if (is_atom("objectname", atom, len)) { - if (!data->mark_query) - strbuf_addstr(sb, oid_to_hex(&data->oid)); - } else if (is_atom("objecttype", atom, len)) { - if (data->mark_query) - data->info.typep = &data->type; - else - strbuf_addstr(sb, typename(data->type)); - } else if (is_atom("objectsize", atom, len)) { - if (data->mark_query) - data->info.sizep = &data->size; - else - strbuf_addf(sb, "%lu", data->size); - } else if (is_atom("objectsize:disk", atom, len)) { - if (data->mark_query) - data->info.disk_sizep = &data->disk_size; - else - strbuf_addf(sb, "%"PRIuMAX, (uintmax_t)data->disk_size); - } else if (is_atom("rest", atom, len)) { - if (data->mark_query) - data->split_on_whitespace = 1; - else if (data->rest) +static void expand_atom(struct strbuf *sb, const char *atom, int len, + struct expand_data *data) +{ + if (is_atom("objectname", atom, len)) + strbuf_addstr(sb, oid_to_hex(&data->oid)); + else if (is_atom("objecttype", atom, len)) + strbuf_addstr(sb, typename(data->type)); + else if (is_atom("objectsize", atom, len)) + strbuf_addf(sb, "%lu", data->size); + else if (is_atom("objectsize:disk", atom, len)) + strbuf_addf(sb, "%"PRIuMAX, (uintmax_t)data->disk_size); + else if (is_atom("rest", atom, len)) { + if (data->rest) strbuf_addstr(sb, data->rest); - } else if (is_atom("deltabase", atom, len)) { - if (data->mark_query) - data->info.delta_base_sha1 = data->delta_base_oid.hash; - else - strbuf_addstr(sb, - oid_to_hex(&data->delta_base_oid)); - } else - die("unknown format element: %.*s", len, atom); + } else if (is_atom("deltabase", atom, len)) + strbuf_addstr(sb, oid_to_hex(&data->delta_base_oid)); } -static size_t expand_format(struct strbuf *sb, const char *start, void *data) +static size_t expand_format(struct strbuf *sb, const char *start, void *vdata) { const char *end; + struct expand_data *data = vdata; if (*start != '(') return 0; @@ -230,7 +230,10 @@ static size_t expand_format(struct strbuf *sb, const char *start, void *data) if (!end) die("format element '%s' does not end in ')'", start); - expand_atom(sb, start + 1, end - start - 1, data); + if (data->mark_query) + mark_atom_in_object_info(start + 1, end - start - 1, data); + else + expand_atom(sb, start + 1, end - start - 1, data); return end - start + 1; } -- https://github.com/git/git/pull/452