From nobody Mon Feb 9 16:52:57 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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.133.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=1617285276; cv=none; d=zohomail.com; s=zohoarc; b=banTMPcRIUn6aw//zMKK/81TGdClDTC0wfs8JA4W8TYHRqkBXvoZBYcSV8UABxuIe6nXO/xOPxFuT3C8b24IBm5rNMRhznxsCx9G0IoQyoGz1zMwuFB7IWPv2TbNAIdCWpqgCLVu73heXyt1//+V6LYu93gP7gFy2S0rs3sOABo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617285276; 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=Dp5/gbAWOgoDIkbS1vFJiOzSldHxfsvJWHJr7EpHHjM=; b=lTXj0EsL/HG+wBEJR3GaYsepemnQ0BHFhtlp3lkqm4sdksDJQ05e09QPi8Dc8K/GG/7HVgCVmy1jWYlrkJewfY+vAlrbYn3evHSqh9M8om2A/mr40ke+J0aFIYxg2m47PbcfyCJWqjTC52SCupAd7SutsyaTtAaa5KtgdgGJO7Y= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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 [170.10.133.124]) by mx.zohomail.com with SMTPS id 1617285276398162.4502941846904; Thu, 1 Apr 2021 06:54:36 -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-132-vi5uYp2nP0O8B7CUcF6GDg-1; Thu, 01 Apr 2021 09:54:32 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B50C81011FD2; Thu, 1 Apr 2021 13:54:05 +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 41CCE7C453; Thu, 1 Apr 2021 13:54: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 E8F0E4A7C8; Thu, 1 Apr 2021 13:54:04 +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 131Ds3hB023335 for ; Thu, 1 Apr 2021 09:54:03 -0400 Received: by smtp.corp.redhat.com (Postfix) id 57EFE7B6F5; Thu, 1 Apr 2021 13:54:03 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.33]) by smtp.corp.redhat.com (Postfix) with ESMTP id 66E458478E for ; Thu, 1 Apr 2021 13:54:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1617285275; 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=Dp5/gbAWOgoDIkbS1vFJiOzSldHxfsvJWHJr7EpHHjM=; b=HKL4DHjQYS6yGdx60qd71Ly97mhRy18cufEmwBFmK/603XV0BwIEBGoCpvOvSbDpcjVbNV gdFkAJIaiHzeccodHjkZ5P3kc7yN9aZzc0QP98FdZiKQh7UapUhoKWLdDmAZ9o/puNJW+A fzjAW+nzyLUwVRBn2IS2QCyb6M4lEMA= X-MC-Unique: vi5uYp2nP0O8B7CUcF6GDg-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 19/39] virHostValidateGetCPUFlags: Use g_strsplit instead of virStringSplitCount Date: Thu, 1 Apr 2021 15:52:18 +0200 Message-Id: <3492ca4fc782124553587c468bbe40ad353c3809.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.15 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" We don't need the count of elements to iterate the list. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- tools/virt-host-validate-common.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/tools/virt-host-validate-common.c b/tools/virt-host-validate-c= ommon.c index fc43b2ddc8..7e9f5a667c 100644 --- a/tools/virt-host-validate-common.c +++ b/tools/virt-host-validate-common.c @@ -201,9 +201,8 @@ virBitmapPtr virHostValidateGetCPUFlags(void) do { char line[1024]; char *start; - char **tokens; - size_t ntokens; - size_t i; + g_auto(GStrv) tokens =3D NULL; + GStrv next; if (!fgets(line, sizeof(line), fp)) break; @@ -228,20 +227,18 @@ virBitmapPtr virHostValidateGetCPUFlags(void) /* Split the line using " " as a delimiter. The first token * will always be ":", but that's okay */ - if (!(tokens =3D virStringSplitCount(start, " ", 0, &ntokens))) + if (!(tokens =3D g_strsplit(start, " ", 0))) continue; /* Go through all flags and check whether one of those we * might want to check for later on is present; if that's * the case, set the relevant bit in the bitmap */ - for (i =3D 0; i < ntokens; i++) { + for (next =3D tokens; *next; next++) { int value; - if ((value =3D virHostValidateCPUFlagTypeFromString(tokens[i])= ) >=3D 0) + if ((value =3D virHostValidateCPUFlagTypeFromString(*next)) >= =3D 0) ignore_value(virBitmapSetBit(flags, value)); } - - virStringListFreeCount(tokens, ntokens); } while (1); VIR_FORCE_FCLOSE(fp); --=20 2.29.2