From nobody Mon Feb 9 09:01:30 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.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 63.128.21.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=1617285245; cv=none; d=zohomail.com; s=zohoarc; b=Uw7ZTgfBSJsm7sTWbXBmf/+Wf4m46CUSZ3CDHDrstslyOBSMy/ZboueuVv8e/CBqBUredAUsJtBDDuTncOKV9N2tE3Fy1vmcgXNIqstIGUPqCUePUDKm/2nZEkgDNCL7RGbLkZctZo7eOWQQpX+KXctdr2/SGkZxGSL3cjvllG4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617285245; 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=tnTE5Pr0o0DYB3qerqxRL+g8gOd577uExLVeke26i0E=; b=f0u5ZulNwMEGEybjt2JHyy0PAgHEITWF5IAD5o+PjAykfsgcO/JiAQtgo7GCe1Zz2QlHeeCl8roSZpMO6M3AhMFl0baaG+CR2U0HdEvIpemiS+l1smSCYZYazwjQDaoBIOtSIQQDb4LrHOIvARy2FOrlqvKwIDbT949rkh/TAAA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1617285245712761.7424622471375; Thu, 1 Apr 2021 06:54:05 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-564-K6IMNAVDMgi23eQ8bOYKGg-1; Thu, 01 Apr 2021 09:54:02 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D936C8189F2; Thu, 1 Apr 2021 13:53:55 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 31EE079453; Thu, 1 Apr 2021 13:53:54 +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 A20E94A7CB; Thu, 1 Apr 2021 13:53:53 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 131Dr8W6023154 for ; Thu, 1 Apr 2021 09:53:08 -0400 Received: by smtp.corp.redhat.com (Postfix) id 94EDA5C5FC; Thu, 1 Apr 2021 13:53:08 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.33]) by smtp.corp.redhat.com (Postfix) with ESMTP id EFCDF5C649 for ; Thu, 1 Apr 2021 13:53:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1617285244; 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=tnTE5Pr0o0DYB3qerqxRL+g8gOd577uExLVeke26i0E=; b=Ks2ZLAFcnSRVXRzccoXWvsHD2SAYwxAMQNOPMvqxTQ/rPdyhgdqENo/eUSFnzRXMCBff2M Aj6KV6FHWZNrnprq1trZwc8K5WxtYniUhuMxEkhLqLE0B7Edg4oAPVbwmxIcFLPTLetz30 02/LW/h4icQvzGYOOoPo7GLdoK3Thzs= X-MC-Unique: K6IMNAVDMgi23eQ8bOYKGg-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 10/39] virStorageFileParseBackingStoreStr: use g_strsplit instead of virStringSplitCount Date: Thu, 1 Apr 2021 15:52:09 +0200 Message-Id: <38cadcdd346160629d9531c8e0be085a49841c81.1617285119.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 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.16 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) Content-Type: text/plain; charset="utf-8" The presence of the second element can be checked by looking at it directly. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/util/virstoragefile.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index e6bc723d1e..e3ec64486e 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -192,17 +192,16 @@ virStorageFileParseBackingStoreStr(const char *str, char **target, unsigned int *chainIndex) { - size_t nstrings; unsigned int idx =3D 0; char *suffix; g_auto(GStrv) strings =3D NULL; *chainIndex =3D 0; - if (!(strings =3D virStringSplitCount(str, "[", 2, &nstrings))) + if (!(strings =3D g_strsplit(str, "[", 2))) return -1; - if (nstrings =3D=3D 2) { + if (strings[0] && strings[1]) { if (virStrToLong_uip(strings[1], &suffix, 10, &idx) < 0 || STRNEQ(suffix, "]")) return -1; --=20 2.29.2