From nobody Sun Feb 8 16:05:46 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1643403543; cv=none; d=zohomail.com; s=zohoarc; b=PeK7nEOQTylLOf3xljju5M3Py71vxSiQEAw337BAyamBIMZ2wTaOr+TT5ZZEyfThE3bFYlZWxkFw8Sd8fm58UvB3ZWKosMTtWOO91bnwgw6pik8pkfvI+QnF6ivReWkAJVGbJYv6k4FmQ2zkm7bTq3SwGxUqC1Cp3EPlF0MW3eA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1643403543; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=vdn6Ordv9MWtX18N4iV9h4/2IyuwFmNAKk0JfB2IdmI=; b=KSTOC/0lo8Jv2UM9onne/1JykK6tPpz9iSgVu34ZGDnE8AB7Ry/9z0Z7dzD873aOsajUeVT0Xf5sfFm8POii3qrTQM/R2aH1bfVycKV9BjrqliJLdUcPQjM2URH7TsVfpXWCwRflRrNwl/GH54QsXpV4g6Zts1G/9gLuPP6VJNA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 164340354387034.29334959826713; Fri, 28 Jan 2022 12:59:03 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-107--UasMjjNMnmweUCpdXvd-w-1; Fri, 28 Jan 2022 15:59:00 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 995A08143F4; Fri, 28 Jan 2022 20:58:55 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7884E610A7; Fri, 28 Jan 2022 20:58:55 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 1D6B91806D2C; Fri, 28 Jan 2022 20:58:55 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 20SKwqBd015479 for ; Fri, 28 Jan 2022 15:58:52 -0500 Received: by smtp.corp.redhat.com (Postfix) id 49B0D10246F4; Fri, 28 Jan 2022 20:58:52 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.40.192.28]) by smtp.corp.redhat.com (Postfix) with ESMTP id 670D11042B7F for ; Fri, 28 Jan 2022 20:58:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1643403543; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=vdn6Ordv9MWtX18N4iV9h4/2IyuwFmNAKk0JfB2IdmI=; b=Lc9wPU1n36GZ8lWF8c0KOJRtoIxz4TTUDa4UVyhpB//CNwkBy5amAtrAU9pg+H5+5rhzQZ +hHihmRX6qTtVxBSsC+gBvnFJApi8WZumBsBtbALZIxRNTBNq/tADzL+eTBv/6xkNGljMj 0VweXzf/+Kn3JdY8oe0GYGjeo/esxjQ= X-MC-Unique: -UasMjjNMnmweUCpdXvd-w-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 2/4] util: virParseVersionString: move to virstring.c Date: Fri, 28 Jan 2022 21:58:44 +0100 Message-Id: <49fc89be0b38c070595c4218b45b8a5006c352ab.1643403498.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1643403546187100001 Signed-off-by: J=C3=A1n Tomko --- src/libvirt_private.syms | 2 +- src/util/virstring.c | 47 ++++++++++++++++++++++++++++++++++++++++ src/util/virstring.h | 4 ++++ src/util/virutil.c | 46 --------------------------------------- src/util/virutil.h | 3 --- 5 files changed, 52 insertions(+), 50 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index bc6fa191bf..38506c52c6 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -3302,6 +3302,7 @@ virStorageFileParseBackingStoreStr; =20 =20 # util/virstring.h +virParseVersionString; virSkipSpaces; virSkipSpacesAndBackslash; virSkipSpacesBackwards; @@ -3546,7 +3547,6 @@ virMemoryLimitIsSet; virMemoryLimitTruncate; virMemoryMaxValue; virParseOwnershipIds; -virParseVersionString; virPipe; virPipeNonBlock; virPipeQuiet; diff --git a/src/util/virstring.c b/src/util/virstring.c index cee56debca..a7ce566963 100644 --- a/src/util/virstring.c +++ b/src/util/virstring.c @@ -1019,3 +1019,50 @@ int virStringParseYesNo(const char *str, bool *resul= t) =20 return 0; } + + +/** + * virParseVersionString: + * @str: const char pointer to the version string + * @version: unsigned long pointer to output the version number + * @allowMissing: true to treat 3 like 3.0.0, false to error out on + * missing minor or micro + * + * Parse an unsigned version number from a version string. Expecting + * 'major.minor.micro' format, ignoring an optional suffix. + * + * The major, minor and micro numbers are encoded into a single version nu= mber: + * + * 1000000 * major + 1000 * minor + micro + * + * Returns the 0 for success, -1 for error. + */ +int +virParseVersionString(const char *str, unsigned long *version, + bool allowMissing) +{ + unsigned int major, minor =3D 0, micro =3D 0; + char *tmp; + + if (virStrToLong_ui(str, &tmp, 10, &major) < 0) + return -1; + + if (!allowMissing && *tmp !=3D '.') + return -1; + + if ((*tmp =3D=3D '.') && virStrToLong_ui(tmp + 1, &tmp, 10, &minor) < = 0) + return -1; + + if (!allowMissing && *tmp !=3D '.') + return -1; + + if ((*tmp =3D=3D '.') && virStrToLong_ui(tmp + 1, &tmp, 10, µ) < = 0) + return -1; + + if (major > UINT_MAX / 1000000 || minor > 999 || micro > 999) + return -1; + + *version =3D 1000000 * major + 1000 * minor + micro; + + return 0; +} diff --git a/src/util/virstring.h b/src/util/virstring.h index 45f07ddd7a..1dbeb7445f 100644 --- a/src/util/virstring.h +++ b/src/util/virstring.h @@ -135,3 +135,7 @@ int virStringParsePort(const char *str, int virStringParseYesNo(const char *str, bool *result) G_GNUC_WARN_UNUSED_RESULT; + +int virParseVersionString(const char *str, + unsigned long *version, + bool allowMissing); diff --git a/src/util/virutil.c b/src/util/virutil.c index 8a6efd4d5c..fe5500726e 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -231,52 +231,6 @@ virScaleInteger(unsigned long long *value, const char = *suffix, } =20 =20 -/** - * virParseVersionString: - * @str: const char pointer to the version string - * @version: unsigned long pointer to output the version number - * @allowMissing: true to treat 3 like 3.0.0, false to error out on - * missing minor or micro - * - * Parse an unsigned version number from a version string. Expecting - * 'major.minor.micro' format, ignoring an optional suffix. - * - * The major, minor and micro numbers are encoded into a single version nu= mber: - * - * 1000000 * major + 1000 * minor + micro - * - * Returns the 0 for success, -1 for error. - */ -int -virParseVersionString(const char *str, unsigned long *version, - bool allowMissing) -{ - unsigned int major, minor =3D 0, micro =3D 0; - char *tmp; - - if (virStrToLong_ui(str, &tmp, 10, &major) < 0) - return -1; - - if (!allowMissing && *tmp !=3D '.') - return -1; - - if ((*tmp =3D=3D '.') && virStrToLong_ui(tmp + 1, &tmp, 10, &minor) < = 0) - return -1; - - if (!allowMissing && *tmp !=3D '.') - return -1; - - if ((*tmp =3D=3D '.') && virStrToLong_ui(tmp + 1, &tmp, 10, µ) < = 0) - return -1; - - if (major > UINT_MAX / 1000000 || minor > 999 || micro > 999) - return -1; - - *version =3D 1000000 * major + 1000 * minor + micro; - - return 0; -} - /** * Format @val as a base-10 decimal number, in the * buffer @buf of size @buflen. To allocate a suitable diff --git a/src/util/virutil.h b/src/util/virutil.h index 6bb55918ad..6adebde242 100644 --- a/src/util/virutil.h +++ b/src/util/virutil.h @@ -44,9 +44,6 @@ int virScaleInteger(unsigned long long *value, const char= *suffix, unsigned long long scale, unsigned long long limit) ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT; =20 -int virParseVersionString(const char *str, unsigned long *version, - bool allowMissing); - char *virFormatIntDecimal(char *buf, size_t buflen, int val) ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT; =20 --=20 2.34.1