From nobody Mon Feb 9 09:01:34 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=1617285326; cv=none; d=zohomail.com; s=zohoarc; b=HzAAl1RLLe6Wal0YLzjVO0HzAia8Dnozv7Pb5byoozWfekZgLOp1tL8BEkVq021PdrLGbz70NgoX1qeIhTVtGQsbG32RrwOMXJZVTdQSIbSCeQhciPCMI1SYZFibw1co6oZoPn6+83Of9Oy4YSQ3ohdwD6zjr8t3sNXXA/ngbdE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617285326; 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=bbZGAEPHNz8Hq7GKGKMk9egU4r1ig98zogpCfi08jAY=; b=I8hmctpXKmlksL1aaPVdoDhgi8NRlHjmQ/5GhStDwPPmGONHcJ0XP4rZi6OJY9HS+gO0zVgR4Hx2fAl+95nZq5JEQJYI1EhDWXA4nJcMPCwIy5Et/5qEbYCQWeuNK6dAhAMVeAnqCKm29ItKj/fOGxQhnP7MeZvwQmE1SB+54c4= 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 1617285326435130.9007626780516; Thu, 1 Apr 2021 06:55:26 -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-442-3d7r9HJVMMCJmG0wQLJ30w-1; Thu, 01 Apr 2021 09:55:23 -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 52316801FD8; Thu, 1 Apr 2021 13:55:16 +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 02BC55C238; Thu, 1 Apr 2021 13:55:16 +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 B826C18045CA; Thu, 1 Apr 2021 13:55:15 +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 131DsLq6023666 for ; Thu, 1 Apr 2021 09:54:21 -0400 Received: by smtp.corp.redhat.com (Postfix) id 84A6F5C237; Thu, 1 Apr 2021 13:54:21 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.33]) by smtp.corp.redhat.com (Postfix) with ESMTP id DF1245C1A1 for ; Thu, 1 Apr 2021 13:54:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1617285325; 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=bbZGAEPHNz8Hq7GKGKMk9egU4r1ig98zogpCfi08jAY=; b=KoK0ZohgkhHGFmDI3OTS5wA6a7P7DsNjvNP+fQbDAEJp9SDGvXdF2J7yAE4eKNw9s1evl9 Vulj+Uv7lJFrfYCghFl0Nf3lGINOeofc0/UFS5cM3lrPG4vtvtdGkoXF3QHGkPoLUy10jg 3wtqXjsl1xhq+tbFXwUOSXdjng3n+bQ= X-MC-Unique: 3d7r9HJVMMCJmG0wQLJ30w-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 35/39] openvzParseBarrierLimit: Rework string handling Date: Thu, 1 Apr 2021 15:52:34 +0200 Message-Id: <560a81e55b53d0c07f77bdd61dbadba145e7954f.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" Use g_strsplit instead of virStringSplitCount and automatically free the temporary string list. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/openvz/openvz_conf.c | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/src/openvz/openvz_conf.c b/src/openvz/openvz_conf.c index 836885af18..cf29ce30ad 100644 --- a/src/openvz/openvz_conf.c +++ b/src/openvz/openvz_conf.c @@ -123,26 +123,21 @@ openvzParseBarrierLimit(const char* value, unsigned long long *barrier, unsigned long long *limit) { - char **tmp =3D NULL; - size_t ntmp =3D 0; - int ret =3D -1; + g_auto(GStrv) tmp =3D NULL; - if (!(tmp =3D virStringSplitCount(value, ":", 0, &ntmp))) - goto error; + if (!(tmp =3D g_strsplit(value, ":", 0))) + return -1; - if (ntmp !=3D 2) - goto error; + if (g_strv_length(tmp) !=3D 2) + return -1; if (barrier && virStrToLong_ull(tmp[0], NULL, 10, barrier) < 0) - goto error; + return -1; if (limit && virStrToLong_ull(tmp[1], NULL, 10, limit) < 0) - goto error; + return -1; - ret =3D 0; - error: - virStringListFreeCount(tmp, ntmp); - return ret; + return 0; } --=20 2.29.2