From patchwork Fri Jul 14 02:01:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Elliott Mitchell X-Patchwork-Id: 13338834 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 lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 90020C001E0 for ; Wed, 2 Aug 2023 21:29:17 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.575503.901186 (Exim 4.92) (envelope-from ) id 1qRJP2-0001pQ-Iz; Wed, 02 Aug 2023 21:29:08 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 575503.901186; Wed, 02 Aug 2023 21:29:08 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qRJP2-0001pH-F2; Wed, 02 Aug 2023 21:29:08 +0000 Received: by outflank-mailman (input) for mailman id 575503; Wed, 02 Aug 2023 21:29:08 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qRJP2-0001nP-0O for xen-devel@lists.xenproject.org; Wed, 02 Aug 2023 21:29:08 +0000 Received: from mailhost.m5p.com (mailhost.m5p.com [74.104.188.4]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 9b7a40ad-317b-11ee-8613-37d641c3527e; Wed, 02 Aug 2023 23:29:06 +0200 (CEST) Received: from m5p.com (mailhost.m5p.com [IPv6:2001:470:1f07:15ff:0:0:0:f7]) by mailhost.m5p.com (8.16.1/8.15.2) with ESMTPS id 372LSusM008502 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Wed, 2 Aug 2023 17:29:02 -0400 (EDT) (envelope-from ehem@m5p.com) Received: (from ehem@localhost) by m5p.com (8.16.1/8.15.2/Submit) id 372LSusJ008501; Wed, 2 Aug 2023 14:28:56 -0700 (PDT) (envelope-from ehem) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 9b7a40ad-317b-11ee-8613-37d641c3527e Message-Id: In-Reply-To: References: From: Elliott Mitchell To: xen-devel@lists.xenproject.org Cc: Wei Liu Cc: Anthony PERARD Cc: Juergen Gross Date: Thu, 13 Jul 2023 19:01:19 -0700 Subject: [PATCH 15/22] tools/utils: move XLU_Config to libxlu_cfg.c Only the lowest layer of configuration handling looks inside XLU_Config. As such the structure can move to this header instead of the shared header. Mark ->config_source as constant. Most places it truly is constant, only the free() violates the constant. Signed-off-by: Elliott Mitchell --- This could also move to libxlu_cfg_y.h and make preserving messages easier while allowing libxlu_cfg.c to split. --- tools/libs/util/libxlu_cfg.c | 8 +++++++- tools/libs/util/libxlu_internal.h | 6 ------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/libs/util/libxlu_cfg.c b/tools/libs/util/libxlu_cfg.c index e37f84829f..69b95a4ed0 100644 --- a/tools/libs/util/libxlu_cfg.c +++ b/tools/libs/util/libxlu_cfg.c @@ -47,6 +47,12 @@ struct XLU_ConfigValue { XLU__CFG_YYLTYPE loc; }; +struct XLU_Config { + XLU_ConfigSetting *settings; + FILE *report; + const char *config_source; +}; + XLU_Config *xlu_cfg_init(FILE *report, const char *report_source) { XLU_Config *cfg; @@ -188,7 +194,7 @@ void xlu_cfg_destroy(XLU_Config *cfg) { set_next= set->next; xlu__cfg_set_free(set); } - free(cfg->config_source); + free((void *)cfg->config_source); free(cfg); } diff --git a/tools/libs/util/libxlu_internal.h b/tools/libs/util/libxlu_internal.h index 214ebe5f48..93caf24a6e 100644 --- a/tools/libs/util/libxlu_internal.h +++ b/tools/libs/util/libxlu_internal.h @@ -27,12 +27,6 @@ typedef struct XLU_ConfigSetting XLU_ConfigSetting; -struct XLU_Config { - XLU_ConfigSetting *settings; - FILE *report; - char *config_source; -}; - #define STRINGIFY(x) #x #define TOSTRING(x) STRINGIFY(x)