From patchwork Tue Jan 26 13:14:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Adler X-Patchwork-Id: 1431679 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2a00:1450:4864:20::23b; helo=mail-lj1-x23b.google.com; envelope-from=swupdate+bncbclp7i7wwmhrbv5mycaamgqebo5yofi@googlegroups.com; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.a=rsa-sha256 header.s=20161025 header.b=TbSL/K2B; dkim-atps=neutral Received: from mail-lj1-x23b.google.com (mail-lj1-x23b.google.com [IPv6:2a00:1450:4864:20::23b]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DQ6hr0cW9z9rx6 for ; Wed, 27 Jan 2021 00:17:15 +1100 (AEDT) Received: by mail-lj1-x23b.google.com with SMTP id g24sf2493605ljj.0 for ; Tue, 26 Jan 2021 05:17:15 -0800 (PST) ARC-Seal: i=3; a=rsa-sha256; t=1611667031; cv=pass; d=google.com; s=arc-20160816; b=sMYCsdDwO1ntMhENAXMecTbAbZR+6ueEnTBz36+4cBC7qNJWQgVSolKa/bjWzXw7lT izl4kRsgHbWSaAQ6TCQh7fJIWolhsQ1FkLLxW+mvszBuQ3DnN7kFOKQWxVSgZiLbsDLo ++wNkTG0kJb/MyDfpujB/reSTHFeXrARWL0YhThZkyT7tLBpubWzySnk1unTWhHPxmXC SXDwZMKHRZmRSDWNdUJQvZ2py7ASMr/RFV0kzUMyFtAHq5kDBlO1IAFser8YAf9j8WKc UHEFxxLut0RmOUJ2Ra/TgINn7ZrgAzIDe7B6V3IuFwoNMkRRy+aECi+CCrrJHBtc8Ch1 wYig== ARC-Message-Signature: i=3; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=t9gBX1qq0QxR/BiCAry1x5ZclIWgREhMx2HAedheeC0=; b=ud2LHDqDhmiI+MRmpCxZ0eEZV2tgjrxJYTt5eHXzIB/lNJVpAylxvReasdHVN9VaMd AumPg7Pq3q3m6xcLWmsP1oaNDIoIPgZcy8F1yrSDQPmC4jVVRg54xOsYZscuKHRmGxFl 3rKH2SlXQwkJENVR92E5R8uZwLRZjhCnhpHwo4kP19dpXJJ+0bOmLM5WiEk1fO6Z0Bja cyZllaWmuPeigIX3jrRq1/18YVNnXut4Zau9/n1Vh/56cDkJZBRaxSUat5idS3xQPYv8 lsRqXQk31CG+1eC2OmRqf1SE/30jqob6CZTgLJ1YABcRmFY1VZh2ZpNQg8kpVAl2G5BR KyzQ== ARC-Authentication-Results: i=3; gmr-mx.google.com; dkim=pass header.i=@siemens.onmicrosoft.com header.s=selector1-siemens-onmicrosoft-com header.b=PzlHfy30; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of michael.adler@siemens.com designates 40.107.21.40 as permitted sender) smtp.mailfrom=michael.adler@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=t9gBX1qq0QxR/BiCAry1x5ZclIWgREhMx2HAedheeC0=; b=TbSL/K2BJjUX9J2BJdiSM/cHM9iN/vWKnEZw4Cc6fefK0ngm4HEHqRx4kD1Ky/mZwf f00S3cLfVVPQt6BtYDkzd4yexCb7F2ApU+rxQN8++1ICR8N+/IqRV0yvNhBQ4JA2v9D8 EOoqJd73Th4/cyb2rWynoXd7Q+Lpc+nlm72Re8mMM8YBYqmUmtbPRYyh5QCPrYYzglBM a1ZJjOOMeeebQVi1md9eAOKz97qACJtmVctqWSzphOQAz9XeXbK62BZU5SiyrAOlIe5z kYBrdZweWR6yE4WYhFf7NKduY6uYpmcijDMdEoo+y88rN+NX9VLTGi005dW6Hwj98GHB J0Xw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=t9gBX1qq0QxR/BiCAry1x5ZclIWgREhMx2HAedheeC0=; b=t26xRaNJdPFZN/cugr9k+7ZO800vgvHUuzUyc+rKL2+QsQlWIixSCTxjrB+Z51N0fE dq4poLnTP6F4fMa8jPnMHDtnJdmXZLxl51vxMTIpu7As1k5cjUPQY8nHj8h992+/L2kM URrQQhi54WsuEPdKAl3Nm24dLuw7W0m2goWrZj9iFUs7zmSGdtbxrqHcqcSI0A1LlSIc 57e8EQY6QyfyS+JWGn5c5OAW4mn3vq0X/skD4XT5mwifeJTvbPFk98PScIRKbTxhav+T yuwoEelj9DfQ8WXv7NDf+39rAaRL0M1Ob5CxT3mcF/T0QZrY9ZKm1wQlPRNDvEONmwsT kniA== Sender: swupdate@googlegroups.com X-Gm-Message-State: AOAM532DKj9uMrHwcoGCjmYaz37vMDhxvXP/h/M0rM25gZJ0BdkXgSwL q4evesMpmy1SzDzvQrn+6bo= X-Google-Smtp-Source: ABdhPJxDcGz1hwobI6VP6ubKYdHK9EjwLWY1wlq1tK/yEOiYmqCGcB/iA3vPTmpG/D8f39oROamiPQ== X-Received: by 2002:a05:651c:54a:: with SMTP id q10mr2909112ljp.454.1611667031625; Tue, 26 Jan 2021 05:17:11 -0800 (PST) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a2e:91c3:: with SMTP id u3ls659468ljg.10.gmail; Tue, 26 Jan 2021 05:17:10 -0800 (PST) X-Received: by 2002:a2e:9b83:: with SMTP id z3mr2907396lji.82.1611667030618; Tue, 26 Jan 2021 05:17:10 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1611667030; cv=pass; d=google.com; s=arc-20160816; b=fh/p9dWkAVOD3TeBNJfd8beipGCMw8L9mDwvsJ4HSs6kcOfHyOMv3qpjp1sjw0K+7h L110PqEAIEBIOxSsZdA96GZY+u2KVHJ7KMgOwJJkn88GmOHVklGAKNztOIup8HtzJQO5 YqMxuQCUtkyiuO6ojI4FWeyIdUMGNk+iOVcd/XIHIUCkYCDExKMJCKJuB2a2VdrKiSLe Da1XNpPF+6P5owgay/m6WAO8CleHV37N9Owlbo3mrCOgqeogPv10N9je93prcqN0QoJA Luzos2eQ7QF9Bdfu3S5IFRKkbnCUaHgmmP1wBXUFKC8SzOjPb2+P+dlG4mcVGBOmb2Gx fJ7Q== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-transfer-encoding:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=PhhEfifVYR7R3OAcpArZ+hZmtDrUYx3+SNjF0te2m4o=; b=RP6A0bIzbRfehYMa6xnx8ENIYmSi9AwC0i0Ee4+6fMduAyiafNqj6OdEkpOwsLgizz uz3qOtmUz21QpxU9rIpfufemOpADObxRI23HjPUIGNQsXmX0iNBw4Tv5ZaHQJ2rbRqnl R3L+zCmtUcpuKT3FPf8XIr1I6LlwbzBiRLbeso/bgj44f9EpSO6NlqSuMAIF/V9GsZNZ SLxcfzOIYERsOFf3gYsxhzHsYTWJCPxFaev80a7Wqyguw3a87Lo/ckIBkCS6pnHAUqKo WBRS785Gjd2EkwDg9ldL/03W0MFLJ1rBnOuRuj4RoaaPGUU2B8JnBcO2d2Mjz4PM3SjQ +JBA== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.onmicrosoft.com header.s=selector1-siemens-onmicrosoft-com header.b=PzlHfy30; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of michael.adler@siemens.com designates 40.107.21.40 as permitted sender) smtp.mailfrom=michael.adler@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2040.outbound.protection.outlook.com. [40.107.21.40]) by gmr-mx.google.com with ESMTPS id v15si26193lft.9.2021.01.26.05.17.10 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Jan 2021 05:17:10 -0800 (PST) Received-SPF: pass (google.com: domain of michael.adler@siemens.com designates 40.107.21.40 as permitted sender) client-ip=40.107.21.40; ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=E8KYMs5CZ/aKGz83njnzw5E0CTtd8Dm58MYYzQVh8hisCLGjHCajedrNgTk0cue69fTNeNYGepd7DC40PyNvi6d8ieag5IFueDNTTv4k39XDVaT74MWBiHxLYaLg4nD7A7l9IiTHUfoosMIM3GOU/uoBDzCtqns5TCrhFEiEzsUJl3XffKPt+DpMwm2wdZ2eUsmYcdgru6fa4//sCKp98vHD025YPAxOzbnMR+HWxWrr1/JRRmpd4V11rAnO5q2xzyiJWQQ/dWs9+R4zid2gLFf9T0Y3ml5HLu1GlSCYaSseR2DsPyq8ja/3I0OXRIDdnN7o1QbTikcC3VkFkHOpVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=PhhEfifVYR7R3OAcpArZ+hZmtDrUYx3+SNjF0te2m4o=; b=KolHfNv4d6TOpMDwN4eJaWKDtO9gpkZpiLheSFt36Nwi1cOtboM7yFT10KEDy3tX+FxziqiAyLSRMUyzViELoDCAFYbff7b1EhOLfoaqQA7Z6oC26tycB2zNjosfaK67ny7XhHWdX4cFLfd0mjrBmtFGwlbVRCT7He5g/Jwspub21bFAHm3Yg+I/xlrvcRifGyA59/NhBst7dIlIT4y6i+1Y8PYaUvr2y5IdI0je/G8HJfB5xBpi96mGQXRVwgXsV/o5oT9ha754lWFDopIxekjX3M8ZxdoiX5tv/XQoG2xD7NyTe2KS7ALWTbU3mPn8rNd7X9SWyjJNVvjQ6hhCPw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=siemens.com; dmarc=pass action=none header.from=siemens.com; dkim=pass header.d=siemens.com; arc=none Received: from AM0PR10MB2322.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:208:d7::22) by AM9PR10MB4611.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:269::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3784.12; Tue, 26 Jan 2021 13:17:09 +0000 Received: from AM0PR10MB2322.EURPRD10.PROD.OUTLOOK.COM ([fe80::2838:c46a:e3fe:2c7a]) by AM0PR10MB2322.EURPRD10.PROD.OUTLOOK.COM ([fe80::2838:c46a:e3fe:2c7a%4]) with mapi id 15.20.3784.019; Tue, 26 Jan 2021 13:17:09 +0000 From: Michael Adler To: swupdate@googlegroups.com Cc: Michael Adler , Christian Storm Subject: [swupdate] [PATCH 9/9] Simplify get_sw_versions Date: Tue, 26 Jan 2021 14:14:12 +0100 Message-Id: <20210126131412.3567-10-michael.adler@siemens.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210126131412.3567-1-michael.adler@siemens.com> References: <20210126131412.3567-1-michael.adler@siemens.com> X-Originating-IP: [93.104.69.78] X-ClientProxiedBy: AM0P190CA0018.EURP190.PROD.OUTLOOK.COM (2603:10a6:208:190::28) To AM0PR10MB2322.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:208:d7::22) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost (93.104.69.78) by AM0P190CA0018.EURP190.PROD.OUTLOOK.COM (2603:10a6:208:190::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3784.12 via Frontend Transport; Tue, 26 Jan 2021 13:17:09 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 32b62e5b-9f3d-4aaa-9df9-08d8c1fcaf75 X-MS-TrafficTypeDiagnostic: AM9PR10MB4611: X-LD-Processed: 38ae3bcd-9579-4fd4-adda-b42e1495d55a,ExtAddr X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6430; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: w7FVFj+emL6fgVUGvelLVTogOqU6KkoAWqd5KU9xz50vmvKbPOJTWqWDvTXkJbgVOUB/HUuOr2jRzL2Mw0fkDBaaZR7tQlzLzBktyH/Y0gU1r5fAt1MqD5Ykwm7h6nvdBkgAUXndEmZFp/kp1xOvQmldjakcVxNmY5Wn5WkBIF3ymkkiCqoojfE1Pvby2fhcv9ax8eH1XohHtFDZw6nn5M/Oi+r09unqjfVa1GuvffgEiedoFQ2hkl/+JBe/Lq4iCCDy3bL7+qUfHDBX6eHvGrlR/tBknBTXiw02ZV7tCnecsI3pSZstWSjp969pjRE8+6ESp04Q3sJVR1ReYSnZNzAt+ctx4iDNSkhxMngCI61tJbNoyshVR5skAz7j2EbFzFCwfAL1jEMi7PVoTKuQqg== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM0PR10MB2322.EURPRD10.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(4636009)(366004)(39860400002)(396003)(376002)(346002)(136003)(86362001)(66476007)(956004)(36756003)(66556008)(66946007)(8676002)(5660300002)(2616005)(6486002)(6666004)(186003)(107886003)(1076003)(16526019)(44832011)(478600001)(6496006)(26005)(2906002)(8936002)(83380400001)(4326008)(316002)(54906003)(6916009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: rvLjp3iKpICnIc93iHzfkwKk8bxgO8w5dZ+2gy51SCtD4OVR5CrpoBDR7l+4kNfnWOTC81rSuqQqiLX6oGnESn+mAuJRmzGgQ43juJVRY9cQpKggWcxPC693Dkat8ZokBIAze+kHG/OpC1L/Si1e2zsUaoSaYL1TvKsaYlwE8MY8Gn5tgA1E1QXBvgs65HgbeEu/fBmGjlLsbjiH6euX5y0L/wCnxLiUZFmdu+O7mONsB99KCjnddFgn2K9jrx61Nroot9jvDMsWZnFVroiE7hav56xrQqPg4V21WS1sJCmWEWNc2srQKsMvbn8DWcw2ny7mpWsut1Oj57/2ar1RBd3lACXSiubDKthyyFDohIw5VysHAM213EFMbuwIA31da0V/GXqu4ru2+pVDu+7iT8qZNHtG/pV35b5+XF4pv+dLUi3AQumFd5eC0wkNQUAnCRY4S24XJFFWduFL9vrGAdqyszp2bBg5ntJ3uNcW9nvZvmPL+xLRsclxdU23ifFQN09FXTJJ6qOfxyTH9fDfIajM1yZclWQqowIh1fhExN0Web2QQIrOTy+JY2XEnzgL0iCpcHuNBUoBCyOBSVQaX6Tvhx5PHF1a4KwFfdii9n3rI81OWvxT/asgAHv+LZJqJOhtQZMhdsVZGtIHi2WnArxxlGzBO0hryovFybYgkyx90ezTsFoB7Iqz81ndBmZgxi3vxOEwW8luHVl5LBtW0ClLji9YGEehIuH7NQPS2VB0xPHtPHD4+0Rv/Y/XZ6hF6DQxl+k1m47erXG87A6beGnYC6Xje7k9RxDUDhd/8vaCVLrXGFLUSimk/gNjVYkeVd2Tr1Qk/7H7yCCiNqVlr4mokaWJVGtkdeKvgW5YfTNPFa0nambAQPky3rpWF1fRUJ0YrnvtQQ0mYdrm/P2CurCNSa09quA1GrcofnpGBsIBTttrLcvGRuPTK4Phwi/FuUdQhpxMhYvWISIidgPbMZttRkRm2JzAQIRlN0PK7EZzuq8qGA5Vkw5iI3KphEy/1yhxYM+uctMNxg7LSt5phCxozQ+c8CUcYcIKV2nEubCnFZEcMSzCktOanKwkiwNk X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: 32b62e5b-9f3d-4aaa-9df9-08d8c1fcaf75 X-MS-Exchange-CrossTenant-AuthSource: AM0PR10MB2322.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jan 2021 13:17:09.4114 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: XhpUTg4UxQ6xUJ6OU0FBbVW+783qWGSnGHB7dpncE+VJp7Z5IVYYg/muLmpV9Uetgj8o6BuoWYkRbVtmCrlwMv5TIga9fmUla+TtZDKAJ2k= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR10MB4611 X-Original-Sender: Michael.Adler@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.onmicrosoft.com header.s=selector1-siemens-onmicrosoft-com header.b=PzlHfy30; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of michael.adler@siemens.com designates 40.107.21.40 as permitted sender) smtp.mailfrom=michael.adler@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Precedence: list Mailing-list: list swupdate@googlegroups.com; contact swupdate+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: swupdate@googlegroups.com X-Google-Group-Id: 605343134186 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , Signed-off-by: Michael Adler Signed-off-by: Christian Storm --- core/artifacts_versions.c | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/core/artifacts_versions.c b/core/artifacts_versions.c index 6074c33..63350d2 100644 --- a/core/artifacts_versions.c +++ b/core/artifacts_versions.c @@ -131,21 +131,12 @@ static int versions_settings(void *setting, void *data) void get_sw_versions(swupdate_cfg_handle *handle, struct swupdate_cfg *sw) { - int ret = -EINVAL; - - /* - * Try to read versions from configuration file - * If not found, fall back to a legacy file - * in the format " " - */ - if (handle != NULL) - ret = swupdate_cfg_read_module_settings(handle, "versions", - versions_settings, - sw); - - if (ret) - ret = read_sw_version_file(sw); - + // Try to read versions from configuration file + if (handle != NULL && swupdate_cfg_read_module_settings(handle, "versions", versions_settings, sw) == 0) { + return; + } + // If not found, fall back to a legacy file in the format " " + read_sw_version_file(sw); } #else