From patchwork Wed Jun 24 15:02:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stijn Devriendt X-Patchwork-Id: 1316281 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::13d; helo=mail-lf1-x13d.google.com; envelope-from=swupdate+bncbclnzfwotyirbd6wzx3qkgqe5o6r2kq@googlegroups.com; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com 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=D2XMyTU/; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=H7cC8FCx; dkim-atps=neutral Received: from mail-lf1-x13d.google.com (mail-lf1-x13d.google.com [IPv6:2a00:1450:4864:20::13d]) (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 49sRGF2RRQz9sTj for ; Thu, 25 Jun 2020 01:02:43 +1000 (AEST) Received: by mail-lf1-x13d.google.com with SMTP id r10sf1471031lfc.6 for ; Wed, 24 Jun 2020 08:02:43 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1593010960; cv=pass; d=google.com; s=arc-20160816; b=wWO8JOpvu596odtQ174WfVeNZ+SAHRLFK5RN/88YHBYgnq89f5Qb1ldMfj1H3mP5UV RELUSPhWS5JvFUxCrOd9JqrepET30TBcVMvuXTmNJrmGhfuufkXvqr7OrQEwX2x+TWVe 3l2PRm0rzFxov0Dudgiyz2QbZzUlmQ+SpnKHipfGV9NmBfYYoqjYsRsZ3glnvGNaBeKC 0Amv7NdM9gJ+BvrmtWmRO6f4YlLgUbfWyBopfjAM/4cUrINyYAOqnrT66KcVq/yja+iv 8XAgn4QNqZsm59GRYZcGW6cN7Mj5qQKSb27/+N0NQMX53lT/9yu7ZFRP/mo0u2H1qUOi B/Eg== ARC-Message-Signature: i=2; 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:references:in-reply-to:message-id :date:subject:cc:to:from:mime-version:sender:dkim-signature :dkim-signature; bh=0wnVz6QSuVrcZeD/186e6jNGHHKT8Qdg7OanEbVqDq0=; b=KLvfHXo3Pr6OWyqw6Gju33uWcsMuIqTsXhv3iyhXRIVaXJc/GjdvFr6GZ0YYb19iv1 zhpvShZROyEFDrKbqVX0sQlDkDqd/HcUnkO945QKh1LCggRcKJFzPupcKWHz37cRz6by 6/hCdfV+yAN1RDQD+9cquvxXJpvdztASnegu+tliNS9pa6g18NlnQKCAkKUZ9FVseSmb mEi7udrk5DGV9fsR2AgNqNiIf0lrCmBrrXZqRM7wBqHtHjqXnEjdP3zZFMgZf4kuZzhW bc1Ijs6C++IctmrcTMOaaPEm3jXCka1vP0mKRFkbeuKIn332owMKlb7cGdG4xWPE22RE N6CQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=dn503nUO; spf=pass (google.com: domain of highguy@gmail.com designates 2a00:1450:4864:20::642 as permitted sender) smtp.mailfrom=highguy@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:mime-version:from:to:cc:subject:date:message-id:in-reply-to :references:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=0wnVz6QSuVrcZeD/186e6jNGHHKT8Qdg7OanEbVqDq0=; b=D2XMyTU/jqxOjBRcZEbzacd/PrgSKOMmbkpo3ec2mw4xVlcPXHx5I9uGBSH9YIQu2q bpJwgi0tJk8xE1xOuvk2coedkzyy/fQyVRWKutiX/gm2tvwXHmIR49ODjIT692NdvBZT CB4Eaaii+KYnGBYLeq8eLKhNbr3jWKrk3ipVOOBCxTEXKu0/QbpYbwZBD2KwzffA1crR 8oXSjUz8BxnKhxKduHaO9fJ2b54a3FdmYtwAXQPNv/lVLmOlr7irKe8Fiy9gzSF5Ixcg gV8KMeZR3vwpvioZvC5di1oXutpvanilx/odEgxqZ55n5X10h2i47vHDNy9+NhqjIS5R r13g== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:to:cc:subject:date:message-id:in-reply-to :references:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=0wnVz6QSuVrcZeD/186e6jNGHHKT8Qdg7OanEbVqDq0=; b=H7cC8FCxo5CNm9mqFE7Okxm0j/aUavLfOH/RoQqnUTvot0OZ38v6w+eCVeqEe1wF1k EznEum3ZuZXqfHypjNYmcNbenKrRFjo6m1S7CfQvHKv+K8lMpJpStvT8HJwUQrGARzU8 C4yoefK/vjPLPSu8ihAonwE72KfoExXHheHXX/IPOumbAPr7LHIkCDgFPhiFH9vtWpFF B06In+JDfu92vGqoPPaFvWFs0tkzZv9tK/XhaKq/8FGkUOpFUK9rwH7AfX8oEV5l1Up0 tokXH0u7omJqBiL1ML9O6oNVJdZTkP7Ssek1PQWBHlu+lRLLCVu+c+GuNniLvm9oxiT8 qFjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:mime-version:from:to:cc:subject:date :message-id:in-reply-to:references: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=0wnVz6QSuVrcZeD/186e6jNGHHKT8Qdg7OanEbVqDq0=; b=Lf0S/kMIpQCNvbHAPigbtOj03a4BYesse4734bDDvy8IxCiEVMVfa6BUyU3hgtOvhS a6tj6/pUo6wtNXmoUZTv2Xg3JQXKq9BkCfdMdh4YeMUWhDXUUc5D9f2254B/CxvXp+hi dJmfygKqRPYt7l1cPYIuBL8xnzu/DdAfEgxcHwEsz2F6egGKzjPEDzBx/0aLr6zHJ7vR 7IvWY4D51mlYontb0hyjGw5fESXXVeaMYOac1D4GP0HNcF/r3wue5g1Yv6TsYwwzoSZ8 4gaRKf0ittQy4DlDftoszCGOaqgl7Yyvg7geYsvtsCVgIL+FnWT6jQ7r5/m3ZV7MHyEy Mfiw== Sender: swupdate@googlegroups.com X-Gm-Message-State: AOAM533D8ztHf+qo86LD2F7B4ySiLzcZj0EkW/4WHnBeUNHiX/cwjuUT LkbHW01UdMWHkn0ABvI1c4w= X-Google-Smtp-Source: ABdhPJyJ33NQOKhle2PJZDj96e+04e0ROdLaxZytcwmYnUucDfz9PzflTDYufdsBgbj6neiuSZez+w== X-Received: by 2002:a2e:904a:: with SMTP id n10mr8150846ljg.317.1593010959912; Wed, 24 Jun 2020 08:02:39 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: swupdate@googlegroups.com Received: by 2002:a2e:864a:: with SMTP id i10ls515265ljj.8.gmail; Wed, 24 Jun 2020 08:02:38 -0700 (PDT) X-Received: by 2002:a2e:b53b:: with SMTP id z27mr14562429ljm.173.1593010958818; Wed, 24 Jun 2020 08:02:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593010958; cv=none; d=google.com; s=arc-20160816; b=xw8+1wcDu4An/kk57q0VtV/Vy+KxsPaKO5gXe8QHKAsB7s1okfdATc/cNdoYo4Klin ZsZyvFcH12KhGF7W21q3Y/+VZEcXKqL9hemx1b9K/wY1aXQ+lARj8hIpNWRbxGgp9Puu zEGilTwxww9htVZvyq/hHRKVEa0ZHN5Zqmha0doV+iUpIHWjrY7tKqFLziBZEARrUlVN r6mJ+uB0Lm3l4L0yXbT/sW0vGRhjddKySRCNB5fNxt3RrAyO6dQbapepSE8NKtI+MmPZ UKhyVvDaqFSZ28+r8J0oLM1FTS8popRqgpGvI3+K/C+bZyV6GM7QpvxW9XETOq1mqlID gG/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=dt5nLu9XbDNPpuF8mfFieb2giFi3LTi+1j2ykMJ5PTU=; b=jQ2ggdTE1RY2085wsPKq2VjxjQnX5B4oSvc5akm5V2r2kp7EoGZcEv3lIVMYCFA0kE Q2Yt7kXdn5F2D2LVcUjohxU1WYQ6fUnyMgdrvCeQRvSNBXMy+bnkWusf3RNfOSr4daUu LeN0dyN0JXyd200TSYpeJe1FBCPFFoswjz8QWgFnKEgN3uwoUCNyRxux6N4KUbMP28JW BqV8TJxISppoOlsV1M6KI1eEGXgVIFGrrpPDrO47uKPAq2Xi3W3C4ceYRoUN7GDolQ2y i07hM6fbdvyMr69DbPL2knzSm3cey+oj7wOijH2KRxyBpjRtWkd39w6Dxfk6p/x6Dn/K XwIA== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=dn503nUO; spf=pass (google.com: domain of highguy@gmail.com designates 2a00:1450:4864:20::642 as permitted sender) smtp.mailfrom=highguy@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from mail-ej1-x642.google.com (mail-ej1-x642.google.com. [2a00:1450:4864:20::642]) by gmr-mx.google.com with ESMTPS id 7si668897lfk.0.2020.06.24.08.02.38 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 24 Jun 2020 08:02:38 -0700 (PDT) Received-SPF: pass (google.com: domain of highguy@gmail.com designates 2a00:1450:4864:20::642 as permitted sender) client-ip=2a00:1450:4864:20::642; Received: by mail-ej1-x642.google.com with SMTP id w16so2793466ejj.5 for ; Wed, 24 Jun 2020 08:02:38 -0700 (PDT) X-Received: by 2002:a17:906:4045:: with SMTP id y5mr16751154ejj.261.1593010958398; Wed, 24 Jun 2020 08:02:38 -0700 (PDT) Received: from localhost.localdomain (ptr-dv4l9auo94d15py9dm5.18120a2.ip6.access.telenet.be. [2a02:1811:ce13:ba00:64eb:9936:d58e:a32d]) by smtp.googlemail.com with ESMTPSA id t20sm15873002ejx.27.2020.06.24.08.02.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Jun 2020 08:02:37 -0700 (PDT) From: Stijn Devriendt To: HIGHGuY@gmail.com, sbabic@denx.de Cc: swupdate@googlegroups.com, Harlan.Kassler@FlukeNetworks.com, Stijn Devriendt Subject: [swupdate] [PATCH 2/2] core/artifacts_version: Don't concat version Date: Wed, 24 Jun 2020 17:02:33 +0200 Message-Id: <20200624150234.7476-2-sde@unmatched.eu> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: X-Original-Sender: HIGHGuY@gmail.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=dn503nUO; spf=pass (google.com: domain of highguy@gmail.com designates 2a00:1450:4864:20::642 as permitted sender) smtp.mailfrom=highguy@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.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: , semver_render() doesn't overwrite, but instead appends to the string. Reset the string to cope. Signed-off-by: Stijn Devriendt --- core/artifacts_versions.c | 1 + 1 file changed, 1 insertion(+) diff --git a/core/artifacts_versions.c b/core/artifacts_versions.c index a5649af..06c978a 100644 --- a/core/artifacts_versions.c +++ b/core/artifacts_versions.c @@ -192,6 +192,7 @@ void cleanup_version(char* str) return; if (semver_parse(str, &version) == 0) { + *str = '\0'; semver_render(&version, str); } else { WARN("Unparseable version string. Using 0.0.0 instead!");