From patchwork Wed Nov 30 18:03:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ren=C3=A9_Scharfe?= X-Patchwork-Id: 13060194 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2EB2CC4321E for ; Wed, 30 Nov 2022 18:03:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229676AbiK3SDm (ORCPT ); Wed, 30 Nov 2022 13:03:42 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58000 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229559AbiK3SDl (ORCPT ); Wed, 30 Nov 2022 13:03:41 -0500 Received: from mout.web.de (mout.web.de [212.227.17.11]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 57A7B6C72B for ; Wed, 30 Nov 2022 10:03:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=s29768273; t=1669831407; bh=BELVZTOFweG4MXi49FK/7BMX053QNdU9nRvU/1a5hFQ=; h=X-UI-Sender-Class:Date:Subject:From:To:Cc:References:In-Reply-To; b=hBBVmPY2xpwB7D4PjlwCTjzGNyI7uYkhMmLZe0xQlml+w4ZQfnlBptfjwFfwTeSNe DaAWOCrdChJioArHWwX2/8KE+6zLhscHftTRcqme66/7TYIf8HhD/C4e6JZckxEz4Y XXaEw5o0lDPj3hVSRny4RXV5S9a8g703ztjzZFzc0CJ/oBfxpHi0z+Jp5vF8KM91L1 OuU6xx1vovdum4jvMYHJOPgVsTfWEu2hvPWmr61Bw3DbCr2jK274qc5u2LxJ3Z9vEz Ks86hKIUToX5bLLW7gDsC7NGefgP3WMWEtL1pFSYz8ctqRBJeYFH3RHl99wJ1OhJjV usIye55cPCpGw== X-UI-Sender-Class: 814a7b36-bfc1-4dae-8640-3722d8ec6cd6 Received: from [192.168.178.29] ([91.47.154.159]) by smtp.web.de (mrweb106 [213.165.67.124]) with ESMTPSA (Nemesis) id 1MdO9K-1oR6bu3zqC-00ZDYc; Wed, 30 Nov 2022 19:03:27 +0100 Message-ID: <19be5afa-63e8-5f11-c5f4-6f391677e4c4@web.de> Date: Wed, 30 Nov 2022 19:03:26 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.5.0 Subject: [PATCH 1/3] diff: factor out add_diff_options() Content-Language: en-US From: =?utf-8?q?Ren=C3=A9_Scharfe?= To: Git List Cc: Junio C Hamano , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBC?= =?utf-8?b?amFybWFzb24=?= , Jeff King References: <0620b4a6-b80a-d8a0-5a35-857b9fe0c986@web.de> In-Reply-To: <0620b4a6-b80a-d8a0-5a35-857b9fe0c986@web.de> X-Provags-ID: V03:K1:Y8KWpQuWplgU49aQyMsMma9s0Je+btx8sjDGHgNLhEJh8sYlw2l ATRJoeyqlyeR/O1f74qohceyWlIQhqoiCPChUJ+XUW5nwYtclUJdbGkHisHNfQLPMkwFnFP hC7hXfokVfft1pmyWpjr+fLc00TUPDcAFr2WTP8x0Siw/2Zqoekat/IvOYRPEsEEnDPV26V vJhWG9xVZVihZvOaoP9cw== UI-OutboundReport: notjunk:1;M01:P0:SFSeQPPuCT8=;HSroOq6+YigHRN35Pa1fOKT9AZ0 xB5SfH8rPmiNtnuJuM6v3Lo0Qa2LTLGYgLryUN+9wZvAqSo7FPzvnBoWhBlt4iVRCmBLABDqz rFdWJjcesnmdADL5RFkOH3KDDwFyCYA3a8+qfDlJZ6sc9vvYeDP5DFyOEzPuZWsd0MeCvIJUi sk1twOXioD2gm6iCe2sNmfjjEm8oTCO6fqB9GDp3lqrOrNznTpfs+F+GNjz80M6R0h7McBZ2R 3vo7OIojQJCVhPD11UYILEHzn/nJPC0c5t1RMpxVRcztTS7YqVL1s3vZ4IFDJFqezTKep9YaA aUfemcK6FJXMQSdM7Zq8J45Gg8qcMky6pp0GkGnbay0sU0r4pbyrBvZ8BJMRB7+4Zvrgd5fLl d8lOHXEL5sZnkzcDA1TVKA9ikjlv0l5jz2a4n3JsfkAUlOccqUTWka5XuuiJuhDco3HxsA1mo MOAvNLp80IVyz5QXmj/ZbxSLEQxmKNQVfoC8ZghCB4uMpy4WSFpcHZBaHJQDLBwdQrAdZpzzK ZZqiUbNT/sFLCIMzuHzCB/BgHNkbL+OVanLsOQ8oVJYvWKOKcR54ZHPhyJINto5a4b/yZgOJz aZ9GPAw2h2CKUqk7+CIuj8tuEJtroLevgaT2Wdy2STVXboJCXkcprWAlGpoWuK63bf5apq5dl UF04q+ANFskVhCGIhvy0s60INSFd5LhUtcf5vBvAT04uY5Vl0CO9NkqxgV8RlTmYgKqrR5yof +F9Gmr+Au0/hA12iTo1Z/zuSlEW7xzE3GysqWxIPZLwaakHC/39oKsAbcHn/XDm3WRbWcEGjK P0hskMs5uEzbwtIngCiAmAXEML/d2G8UJQRWQ42VuvFpqUQ1iJbPAlCzfcMEbuHajsN8nEGq6 qMO1DBMPgiQSdsb6dNxjIhkJPT0TnjX7t4tUFTsCsq30WgEpHle4LvO67Kc568k+9llAqJva/ oilL5zoJ9TBMo5iyRpeCqpVxp2E= Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Add a function for appending the parseopts member of struct diff_options to a struct option array. Use it in two sites instead of accessing the parseopts member directly. Decoupling callers from diff internals like that allows us to change the latter. Signed-off-by: René Scharfe --- builtin/range-diff.c | 2 +- diff-no-index.c | 3 +-- diff.c | 6 ++++++ diff.h | 1 + 4 files changed, 9 insertions(+), 3 deletions(-) -- 2.38.1 diff --git a/builtin/range-diff.c b/builtin/range-diff.c index e2a74efb42..aecfae12d3 100644 --- a/builtin/range-diff.c +++ b/builtin/range-diff.c @@ -47,7 +47,7 @@ int cmd_range_diff(int argc, const char **argv, const char *prefix) repo_diff_setup(the_repository, &diffopt); - options = parse_options_concat(range_diff_options, diffopt.parseopts); + options = add_diff_options(range_diff_options, &diffopt); argc = parse_options(argc, argv, prefix, options, builtin_range_diff_usage, PARSE_OPT_KEEP_DASHDASH); diff --git a/diff-no-index.c b/diff-no-index.c index 18edbdf4b5..05fafd0019 100644 --- a/diff-no-index.c +++ b/diff-no-index.c @@ -255,8 +255,7 @@ int diff_no_index(struct rev_info *revs, }; struct option *options; - options = parse_options_concat(no_index_options, - revs->diffopt.parseopts); + options = add_diff_options(no_index_options, &revs->diffopt); argc = parse_options(argc, argv, revs->prefix, options, diff_no_index_usage, 0); if (argc != 2) { diff --git a/diff.c b/diff.c index 1054a4b732..e01129f0ea 100644 --- a/diff.c +++ b/diff.c @@ -5693,6 +5693,12 @@ static void prep_parse_options(struct diff_options *options) memcpy(options->parseopts, parseopts, sizeof(parseopts)); } +struct option *add_diff_options(const struct option *parseopts, + struct diff_options *options) +{ + return parse_options_concat(parseopts, options->parseopts); +} + int diff_opt_parse(struct diff_options *options, const char **av, int ac, const char *prefix) { diff --git a/diff.h b/diff.h index fd33caeb25..c20a1ad76d 100644 --- a/diff.h +++ b/diff.h @@ -539,6 +539,7 @@ int git_diff_ui_config(const char *var, const char *value, void *cb); #define diff_setup(diffopts) repo_diff_setup(the_repository, diffopts) #endif void repo_diff_setup(struct repository *, struct diff_options *); +struct option *add_diff_options(const struct option *, struct diff_options *); int diff_opt_parse(struct diff_options *, const char **, int, const char *); void diff_setup_done(struct diff_options *); int git_config_rename(const char *var, const char *value); From patchwork Wed Nov 30 18:04:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ren=C3=A9_Scharfe?= X-Patchwork-Id: 13060195 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 88FDBC4321E for ; Wed, 30 Nov 2022 18:04:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230031AbiK3SEY (ORCPT ); Wed, 30 Nov 2022 13:04:24 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58222 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229975AbiK3SEU (ORCPT ); Wed, 30 Nov 2022 13:04:20 -0500 Received: from mout.web.de (mout.web.de [212.227.17.12]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 635827062A for ; Wed, 30 Nov 2022 10:04:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=s29768273; t=1669831448; bh=ULKjAoU9yDQjzsXoPz2U6xbYLnHuFks+NR39y5wNP8Q=; h=X-UI-Sender-Class:Date:Subject:From:To:Cc:References:In-Reply-To; b=CWJjWlKgPPDlhZBgH8D6zOYPoT14i1aun5znETOb23W0wFj0ZSxBteqaNfv7SDqCC WFHN/hTbptcjGx5uw9sDQIMxfMWp9E5nWpbtD6+wED01HCwhaSEWKe3pArLAwa2K5n MsVy5TJRysyShMfzf+g9VEflSOCwdSyssUhXwvX3HiNoOsoH6lq8DqYj9LvcF8fA0G PMYuBZbJ/ms7c8MHjBJ0uZWOhJAWE8kp6/Pr0fPsozf6fnq6/fGOnoH4hxxKugPk5c S3O0gCDOykBO4iG1M4I70VVzCRK2blUBScWL69UMvZDDgZZpb3mqKWlagrnOti5O5A Lod9y9MR9VAOg== X-UI-Sender-Class: 814a7b36-bfc1-4dae-8640-3722d8ec6cd6 Received: from [192.168.178.29] ([91.47.154.159]) by smtp.web.de (mrweb105 [213.165.67.124]) with ESMTPSA (Nemesis) id 1MT7aP-1pRD8R3Akx-00UUtw; Wed, 30 Nov 2022 19:04:08 +0100 Message-ID: Date: Wed, 30 Nov 2022 19:04:08 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.5.0 Subject: [PATCH 2/3] diff: let prep_parse_options() return parseopt array Content-Language: en-US From: =?utf-8?q?Ren=C3=A9_Scharfe?= To: Git List Cc: Junio C Hamano , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBC?= =?utf-8?b?amFybWFzb24=?= , Jeff King References: <0620b4a6-b80a-d8a0-5a35-857b9fe0c986@web.de> In-Reply-To: <0620b4a6-b80a-d8a0-5a35-857b9fe0c986@web.de> X-Provags-ID: V03:K1:OLHQ0ypof7sUGyAboeOGdNJfGnXJdgC9GasGPtT1DhOZuDpA/X+ nRfn2kULna9I/ErnScV0IFz6qZyZvMJY0Jo0MsduFRONiyZyFt0/a1l+Wr1zJGxSdTdz7rl Hrx7QATnesctUKB8mcNcBRj5MQCG+4wAb5uyUb3WbarAwQGNIvfgAh91meYKRoqs4lrjIx3 OyYTkzk9dkZDeXPM4hZNg== UI-OutboundReport: notjunk:1;M01:P0:x5ewp7ErxyU=;XjteSdSwKn0+shy0AgDz40BP2I6 CdlfYlDc8cXy8EDs/Fn4RHdsL6D13ag6um6Xim7X6h6HOsD7UTKOp8j0zYw60mSHtWyvgXCZE 31oQRCUVX/XY0VIOHPAWi1doIznaykknz4Izt9TWtQ4mmkL2hYtjPUo8e4lnuoWt5Y/09PJnK yyniYXS4voQ1NCuBBcI+TQZEXxgIk7cduCcxOvt9LMFGpiDc1yBmJTJAITTI6RCjkLKSiSRMW fHQubNOhdgnDVXzAk6g/hQBQxqGYnWKxvVNn1bA08Y0HSnx22q7HWMrlXavxNp9S+s2GJEtLU mqnatiR8bGOPWbnE1RUx1UvqIwMr+Mxd0tGWONddImamVvX3axyCtU5Zh96n5GjuXWuChZiVs 6Lq1nWhjkA7mxIKUdX/pHEXIjhKxP/g2L00uFbce/5OLJTgK6F63X+6WDZyQnkKsPmDPyoZu5 t66VqKwc4P7dZceq9p+ZkMGtFI98iEcfio1bywM0cwuENS81UcLa0PRtUARm7FdvQdD1USbRm 35PMGpkp5YLeVX6sfx57xMw5kZRpmlxCT8JZX35eoWvmY9Ql5UOdlRflqc84X64v8debscl+K eKM1gni3kSR69BiXThdFBnnTugh3R1GoywAulU1FO/j25y42bgAGmyyhQaIXHEGTogtcfUmyQ NaEJgx5DOadRzt8PmOuUOeWdvX5goi459q53yQKEtA4lkbFX0Icj6XgcFjVGJnIsjj8jGzK9n kR2jQt2xdDk4HK6LN0W+ioRPi3R4zuUivuiBEr0BerMWl91HW89icZfc3s+O+vn8YGZeC+CNK Lw8cXpxT6ExLkNDzUVDrwfQAgHfjiybVQwwCzF2DhCNR7j6vCHWE2r2QrZD0cTHJ9pC+wq812 Pm2jzEDc5bKBOcuu1YekoGymqgIgZqzmd0X7tt1mYbOuvUUZ0yt6DcbwjLKIY2UYDe39f7atg 6HYAwwzH6rk27xJ/Wx1GqwcyNyY= Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org prep_parse_options() sets the parseopts member of struct diff_options. Let it return the pointer instead and have its caller do the assignment instead and rename the function to get_diff_parseopts() to reflect that change. This allows using it in other places and with other variables. Signed-off-by: René Scharfe --- diff.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) -- 2.38.1 diff --git a/diff.c b/diff.c index e01129f0ea..e469d5d2a0 100644 --- a/diff.c +++ b/diff.c @@ -4615,7 +4615,7 @@ static void run_checkdiff(struct diff_filepair *p, struct diff_options *o) builtin_checkdiff(name, other, attr_path, p->one, p->two, o); } -static void prep_parse_options(struct diff_options *options); +static struct option *get_diff_parseopts(struct diff_options *options); void repo_diff_setup(struct repository *r, struct diff_options *options) { @@ -4663,7 +4663,7 @@ void repo_diff_setup(struct repository *r, struct diff_options *options) options->color_moved = diff_color_moved_default; options->color_moved_ws_handling = diff_color_moved_ws_default; - prep_parse_options(options); + options->parseopts = get_diff_parseopts(options); } static const char diff_status_letters[] = { @@ -5419,7 +5419,7 @@ static int diff_opt_rotate_to(const struct option *opt, const char *arg, int uns return 0; } -static void prep_parse_options(struct diff_options *options) +static struct option *get_diff_parseopts(struct diff_options *options) { struct option parseopts[] = { OPT_GROUP(N_("Diff output format options")), @@ -5689,8 +5689,7 @@ static void prep_parse_options(struct diff_options *options) OPT_END() }; - ALLOC_ARRAY(options->parseopts, ARRAY_SIZE(parseopts)); - memcpy(options->parseopts, parseopts, sizeof(parseopts)); + return parse_options_dup(parseopts); } struct option *add_diff_options(const struct option *parseopts, From patchwork Wed Nov 30 18:04:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ren=C3=A9_Scharfe?= X-Patchwork-Id: 13060196 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 46D6EC433FE for ; Wed, 30 Nov 2022 18:05:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230070AbiK3SFH (ORCPT ); Wed, 30 Nov 2022 13:05:07 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58744 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229607AbiK3SFB (ORCPT ); Wed, 30 Nov 2022 13:05:01 -0500 Received: from mout.web.de (mout.web.de [212.227.17.11]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0D0817062A for ; Wed, 30 Nov 2022 10:04:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=s29768273; t=1669831494; bh=GbaZqUO7BxbnE5U9vbbLW7jnKic9TqCT9vIdVMTxECI=; h=X-UI-Sender-Class:Date:Subject:From:To:Cc:References:In-Reply-To; b=poU40zJgHXESUpsOCMdoaoqjs2/tufdK35o5cd9Qxo6LVmlqkGfvW15vP4hEf9D3V YQomh5suTU7pxauTvpxjaVmQl7MDsYctxP/5fDMBQS7XMmks0pgx7znTcGT9oEEZ16 QIVfBE3/X6Q79zh3hThWy9lO4MfLOC7dGTcqPtvr1Z3wCPu+Pzm29nJMhdo4bZfWFM pMc6ceBwPVawbjyp89kZnwC9SGQUTpJN1bSw19OsR4vWKqrVGWqAzXku+2/1ua6JCj GZrN6ZcebceKz/wmzqpRQ7qHgYjgPwIsbedJpLv2l3Rp2iygsthuLce4WY5voSHpno vRDo8GZBJ6y6Q== X-UI-Sender-Class: 814a7b36-bfc1-4dae-8640-3722d8ec6cd6 Received: from [192.168.178.29] ([91.47.154.159]) by smtp.web.de (mrweb106 [213.165.67.124]) with ESMTPSA (Nemesis) id 1M7elj-1p5dzH0gUn-0087vD; Wed, 30 Nov 2022 19:04:54 +0100 Message-ID: Date: Wed, 30 Nov 2022 19:04:53 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.5.0 Subject: [PATCH 3/3] diff: remove parseopts member of struct diff_options Content-Language: en-US From: =?utf-8?q?Ren=C3=A9_Scharfe?= To: Git List Cc: Junio C Hamano , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBC?= =?utf-8?b?amFybWFzb24=?= , Jeff King References: <0620b4a6-b80a-d8a0-5a35-857b9fe0c986@web.de> In-Reply-To: <0620b4a6-b80a-d8a0-5a35-857b9fe0c986@web.de> X-Provags-ID: V03:K1:Zu14KmhSd1U+C5hkuHFzSSxvksdaMXeK2zRV/6qSril/TpHttPd utO3pZ5o8R8K8HPGhaA0/m5e4FblepSLaJ0c9WfVfFk8NVAP1XqUutX1yAx4mJP/tPGktkO kPD0ktoiinq2LjjLNdDLj1uWTrUMCtZ5ounnfdRr/vwTSWuxdMrgMUTKA3TAgr/vm48ntAN sslPAYEOh5SqvoZbjl5gQ== UI-OutboundReport: notjunk:1;M01:P0:764HnfZ1WYA=;zvpoBzBt27TNDzNPZqOJ1n8mdpJ gWrix8s/PCedo+QP8+Y7pKG6kWcQilnVaQWOGobKVMLd1d602Fqk/f4fEAwCW73PZf1uNGwoc iCajzfhA4BL1PihDC6fHzPLLA3vC/dDqQ5vOuczNQgAYsfsdpK4ErmRxKwZ43vs5RcjhuCCwl LekeNvpEEmbXffSgMjONwCj/My5U4MFNKYOc9mPZBUt5MonN2FalnTV0IqnIlGd4RBbl5vE8I dduQiI2TaP4Ir4+4IBUIYnH4MnCnVPXiRzNhVqNYPS+FTIthZ3W3hD7Sd8ZOy+ZXGeos0nrPo edRefUs+Y+iO2iqdmpPrgL9gN4bC3U9s+4B9h3gOiddsXJOKQol7vQeEiEgbe8jN6FqBNewhf RVWSbJs3WwbuSfmHh3qdMIbUsdMiPfHQqglpFu9/O0H0QKlb8+VcCOp+VxeFq0GWRfvryZ9qa /3w8/66ohKOu6qPvebB95aTwc+pPsA6mgEjwpkvY4UXyWmJXLpAZfe0hxxGi62dbD5EtdMpGY JmwvSzfahFAKSYbqJc6Eby8VqUHNL96qiuMoJFFEW0r6nS1uRuUHxWvsB35a3FekhbgkK0CNT DPH9eZbJ2Kmb95n/YOscDsIkyy39WWh0m2bfIjHu/gxe0FNDKHsASvq9heKzKqOe+weGlxX96 GAa98j4GLQ7oVMLa873KJjDTcQUUcuRfVUfxLgC6pUa0LmbwOSv8NdysWutbIbOP9wASARnwd 0CGaImNlLK1fXXpDna7m4y/pSbqMm8ccSvEu2XuELUolWiemT5ML8MtiC/wiQjw/AtF1yCGiL UggM+QGcCi4vidAe7Ro78mTsa02u95bC/W+O7nEegGEOSGIUVklpos2KnS7DpIA2zsvUevFdF GUEZpkD9IRdCDKdIkMnLNbm8hhXBYux6O0bMdNgVgD3GuBa7/Q8DVFJobSp6mu5u8n+HHFeRk pv2CzwYjpETMnNA0mbpOmH7c6fQ= Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org repo_diff_setup() builds the struct option array with git diff's command line options and stores a pointer to it in the parseopts member of struct diff_options. The array is freed by diff_setup_done(), but not by release_revisions(). repo_init_revisions() calls repo_diff_setup(), thus calling repo_init_revisions() then release_revisions() leaks it. We could free the array in release_revisions() as well to plug that leak, but there is a better way: Only build it when needed. Move the get_diff_parseopts() calls to the two places that use the array, free it after use and get rid of the parseopts member. Signed-off-by: René Scharfe --- diff.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) -- 2.38.1 diff --git a/diff.c b/diff.c index e469d5d2a0..6415c4dc2d 100644 --- a/diff.c +++ b/diff.c @@ -4615,8 +4615,6 @@ static void run_checkdiff(struct diff_filepair *p, struct diff_options *o) builtin_checkdiff(name, other, attr_path, p->one, p->two, o); } -static struct option *get_diff_parseopts(struct diff_options *options); - void repo_diff_setup(struct repository *r, struct diff_options *options) { memcpy(options, &default_diff_options, sizeof(*options)); @@ -4662,8 +4660,6 @@ void repo_diff_setup(struct repository *r, struct diff_options *options) options->color_moved = diff_color_moved_default; options->color_moved_ws_handling = diff_color_moved_ws_default; - - options->parseopts = get_diff_parseopts(options); } static const char diff_status_letters[] = { @@ -4821,8 +4817,6 @@ void diff_setup_done(struct diff_options *options) options->filter = ~filter_bit[DIFF_STATUS_FILTER_AON]; options->filter &= ~options->filter_not; } - - FREE_AND_NULL(options->parseopts); } int parse_long_opt(const char *opt, const char **argv, @@ -5695,21 +5689,27 @@ static struct option *get_diff_parseopts(struct diff_options *options) struct option *add_diff_options(const struct option *parseopts, struct diff_options *options) { - return parse_options_concat(parseopts, options->parseopts); + struct option *diff_parseopts = get_diff_parseopts(options); + struct option *result = parse_options_concat(parseopts, diff_parseopts); + free(diff_parseopts); + return result; } int diff_opt_parse(struct diff_options *options, const char **av, int ac, const char *prefix) { + struct option *diff_parseopts = get_diff_parseopts(options); + if (!prefix) prefix = ""; - ac = parse_options(ac, av, prefix, options->parseopts, NULL, + ac = parse_options(ac, av, prefix, diff_parseopts, NULL, PARSE_OPT_KEEP_DASHDASH | PARSE_OPT_KEEP_UNKNOWN_OPT | PARSE_OPT_NO_INTERNAL_HELP | PARSE_OPT_ONE_SHOT | PARSE_OPT_STOP_AT_NON_OPTION); + free(diff_parseopts); return ac; } @@ -6518,7 +6518,6 @@ void diff_free(struct diff_options *options) diff_free_file(options); diff_free_ignore_regex(options); clear_pathspec(&options->pathspec); - FREE_AND_NULL(options->parseopts); } void diff_flush(struct diff_options *options)