From nobody Sun Feb 8 23:06:10 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=1639052533; cv=none; d=zohomail.com; s=zohoarc; b=eFXfLkKXCkDw64hGaEZBlGjSqbt3jdly9JKK9qonlgugwwD35+ZJ9gl+Q9Lul9KyVtBWK3fP8KFfnuojMA/z115LpZQu7GIalk68aFItyh3MYgKXfE/FxKvXNiLNbKCtMJuylkCDHvMJ1tXSs8B5jP8IpSaQc4JXjOhVDUzqL7A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1639052533; 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=2H5+5PQOqGl2rH1SU/SfmbnBytPKzKQE3CGyoYIB/Ls=; b=oGBvHtdFakQpcB5IUMPcFoXdIlQzwGbEeFGc/xrY4a6lFtF9Yc3NxxnspcfrSh8YQFCxkILGRLiuQ0jFkizF7ZUZYTW/Iq+WSXzOkah5H4Q8i/Msd0kwzWYY9ta9ME6/8SNudbkCw5VggTppMjtyr1buVxyw1UFW55QNUGIru+M= 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 1639052533640715.1154659566943; Thu, 9 Dec 2021 04:22:13 -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-25-9BJniLDHN3W__nH3nKEqGg-1; Thu, 09 Dec 2021 07:22:11 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C806018A0F26; Thu, 9 Dec 2021 12:22:05 +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 AF91860657; Thu, 9 Dec 2021 12:22:05 +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 7364C1802E2C; Thu, 9 Dec 2021 12:22:05 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1B9CM3hY015468 for ; Thu, 9 Dec 2021 07:22:03 -0500 Received: by smtp.corp.redhat.com (Postfix) id 9DD415ED2B; Thu, 9 Dec 2021 12:22:03 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.10]) by smtp.corp.redhat.com (Postfix) with ESMTP id 042B75ED27 for ; Thu, 9 Dec 2021 12:21:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1639052532; 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=2H5+5PQOqGl2rH1SU/SfmbnBytPKzKQE3CGyoYIB/Ls=; b=aqbK20U7clfyor2wOJWeiPRRWOxNBY9vEwzNoV2LGKP0YNelCZYSHvW/cZQPNo7vbfqhIn Xv0ewtb/1DbbgMnIyxijqRljwFyXxxqvq3gPW1qozNPLyAyzGhEDjNg3emsnRL5tx4zWKO 1mn3GGagoZ320lJXFugL4i9u34ZN4jU= X-MC-Unique: 9BJniLDHN3W__nH3nKEqGg-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 25/36] virBitmapParseSeparator: Remove separator parsing capability Date: Thu, 9 Dec 2021 13:18:30 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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.11 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1639052535613100001 Content-Type: text/plain; charset="utf-8" Since the feature is not needed remove it and remove the function to virBitmapParseInternal. Signed-off-by: Peter Krempa --- src/util/virbitmap.c | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/src/util/virbitmap.c b/src/util/virbitmap.c index a3f674eb19..1aaefba133 100644 --- a/src/util/virbitmap.c +++ b/src/util/virbitmap.c @@ -364,9 +364,8 @@ virBitmapFormat(virBitmap *bitmap) /** - * virBitmapParseSeparator: + * virBitmapParseInternal: * @str: points to a string representing a human-readable bitmap - * @terminator: character separating the bitmap to parse * @bitmap: a bitmap created from @str * @bitmapSize: the upper limit of num of bits in created bitmap * @@ -377,19 +376,12 @@ virBitmapFormat(virBitmap *bitmap) * to set, and ^N, which means to unset the bit, and N-M for ranges of bits * to set. * - * To allow parsing of bitmaps within larger strings it is possible to set - * a termination character in the argument @terminator. When the character - * in @terminator is encountered in @str, the parsing of the bitmap stops. - * Pass 0 as @terminator if it is not needed. Whitespace characters may not - * be used as terminators. - * * Returns 0 on success, or -1 in case of error. */ static int -virBitmapParseSeparator(const char *str, - char terminator, - virBitmap **bitmap, - size_t bitmapSize) +virBitmapParseInternal(const char *str, + virBitmap **bitmap, + size_t bitmapSize) { bool neg =3D false; const char *cur =3D str; @@ -407,7 +399,7 @@ virBitmapParseSeparator(const char *str, if (*cur =3D=3D '\0') goto error; - while (*cur !=3D 0 && *cur !=3D terminator) { + while (*cur !=3D 0) { /* * 3 constructs are allowed: * - N : a single CPU number @@ -431,7 +423,7 @@ virBitmapParseSeparator(const char *str, virSkipSpaces(&cur); - if (*cur =3D=3D ',' || *cur =3D=3D 0 || *cur =3D=3D terminator) { + if (*cur =3D=3D ',' || *cur =3D=3D 0) { if (neg) { if (virBitmapClearBit(*bitmap, start) < 0) goto error; @@ -465,7 +457,7 @@ virBitmapParseSeparator(const char *str, cur++; virSkipSpaces(&cur); neg =3D false; - } else if (*cur =3D=3D 0 || *cur =3D=3D terminator) { + } else if (*cur =3D=3D 0) { break; } else { goto error; @@ -503,7 +495,7 @@ virBitmapParse(const char *str, virBitmap **bitmap, size_t bitmapSize) { - return virBitmapParseSeparator(str, '\0', bitmap, bitmapSize); + return virBitmapParseInternal(str, bitmap, bitmapSize); } --=20 2.31.1