From patchwork Tue Jul 18 23:31:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Elliott Mitchell X-Patchwork-Id: 13319217 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 A6EADC001DE for ; Wed, 19 Jul 2023 16:55:22 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.566042.884687 (Exim 4.92) (envelope-from ) id 1qMAS1-0002hr-UX; Wed, 19 Jul 2023 16:54:57 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 566042.884687; Wed, 19 Jul 2023 16:54:57 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qMAS1-0002hR-RH; Wed, 19 Jul 2023 16:54:57 +0000 Received: by outflank-mailman (input) for mailman id 566042; Wed, 19 Jul 2023 16:54:57 +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 1qMAS1-0002h2-Be for xen-devel@lists.xenproject.org; Wed, 19 Jul 2023 16:54:57 +0000 Received: from mailhost.m5p.com (mailhost.m5p.com [74.104.188.4]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id fc26784e-2654-11ee-8611-37d641c3527e; Wed, 19 Jul 2023 18:54:55 +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 36JGsiRV034053 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Wed, 19 Jul 2023 12:54:50 -0400 (EDT) (envelope-from ehem@m5p.com) Received: (from ehem@localhost) by m5p.com (8.16.1/8.15.2/Submit) id 36JGsig4034052; Wed, 19 Jul 2023 09:54:44 -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: fc26784e-2654-11ee-8611-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: Tue, 18 Jul 2023 16:31:34 -0700 Subject: [PATCH 5/7] tools/utils: move XLU_ConfigSetting & xlu__cfg_set_free() to libxl_cfg.c XLU_ConfigSetting is only used inside libxl_cfg.c, so no need for it in the internal header. Similarly, xlu__cfg_set_free() is no longer used outside libxl_cfg.c, so remove from header and redeclare static. Signed-off-by: Elliott Mitchell --- tools/libs/util/libxlu_cfg.c | 10 +++++++++- tools/libs/util/libxlu_cfg_i.h | 1 - tools/libs/util/libxlu_internal.h | 8 -------- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/tools/libs/util/libxlu_cfg.c b/tools/libs/util/libxlu_cfg.c index b2947cbfc9..2979d775a6 100644 --- a/tools/libs/util/libxlu_cfg.c +++ b/tools/libs/util/libxlu_cfg.c @@ -25,6 +25,14 @@ #include "libxlu_cfg_l.h" #include "libxlu_cfg_i.h" +typedef struct XLU_ConfigSetting { /* transparent */ + struct XLU_ConfigSetting *next; + char *name; + XLU_ConfigValue *value; + enum XLU_Operation op; + int lineno; +} XLU_ConfigSetting; + struct XLU_Config { XLU_ConfigSetting *settings; FILE *report; @@ -155,7 +163,7 @@ void xlu__cfg_value_free(XLU_ConfigValue *value) free(value); } -void xlu__cfg_set_free(XLU_ConfigSetting *set) { +static void xlu__cfg_set_free(XLU_ConfigSetting *set) { if (!set) return; free(set->name); xlu__cfg_value_free(set->value); diff --git a/tools/libs/util/libxlu_cfg_i.h b/tools/libs/util/libxlu_cfg_i.h index 3d1e4ed568..7193867422 100644 --- a/tools/libs/util/libxlu_cfg_i.h +++ b/tools/libs/util/libxlu_cfg_i.h @@ -26,7 +26,6 @@ enum XLU_Operation { XLU_OP_ADDITION, }; -void xlu__cfg_set_free(XLU_ConfigSetting *set); void xlu__cfg_set_store(CfgParseContext*, char *name, enum XLU_Operation op, XLU_ConfigValue *val, int lineno); diff --git a/tools/libs/util/libxlu_internal.h b/tools/libs/util/libxlu_internal.h index 2ef5eb7f5e..97303391c6 100644 --- a/tools/libs/util/libxlu_internal.h +++ b/tools/libs/util/libxlu_internal.h @@ -49,14 +49,6 @@ struct XLU_ConfigValue { YYLTYPE loc; }; -typedef struct XLU_ConfigSetting { /* transparent */ - struct XLU_ConfigSetting *next; - char *name; - XLU_ConfigValue *value; - enum XLU_Operation op; - int lineno; -} XLU_ConfigSetting; - typedef struct { XLU_Config *cfg; int err, lexerrlineno, likely_python;