From nobody Mon Feb 9 12:12:08 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1617285311; cv=none; d=zohomail.com; s=zohoarc; b=RkpWPdsX+JTFcuvX3coS5hXe3ErLdwlhFeWEXU4HrsAPsrYrsrkzPhG3h20d0OsPn6+WVf4hOBID97Zdf6C9LNUScA6H1o8Do5VCp1wymr7XgAGGGAghQpFuzBeKdvOSArHfOnczUEKQjzaTQQ5v5bEhCWOCYA8jViF6AOER6Ws= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617285311; 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=ZOSRNVHLLmThwHe7R0qZYDd2wfPfA5094ZEJwFbgd9U=; b=NQevD3YgdJdgKpD45ran4jvxmwJ/B2LgSm+2JeTCaWYiidr1Y7/Y3WR8RG/27dR2He5MUkHQYitCTk1BTwjPh2UR8opTeueVgqNyT6tA97Q8OteJetNlecqz8XrwxeeJBhTS8VqBHoaSWsmUeV3vJaQ7bmJANnAY3VwuThTaiMg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.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 [216.205.24.124]) by mx.zohomail.com with SMTPS id 1617285311483731.3753019148645; Thu, 1 Apr 2021 06:55:11 -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-427-67WvPGTwNk6FfoylvMP4kg-1; Thu, 01 Apr 2021 09:55:08 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3D27772F6E; Thu, 1 Apr 2021 13:54:14 +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 004C982AD9; Thu, 1 Apr 2021 13:54:13 +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 9CC164A700; Thu, 1 Apr 2021 13:54:13 +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 131Ds4kH023381 for ; Thu, 1 Apr 2021 09:54:04 -0400 Received: by smtp.corp.redhat.com (Postfix) id 834B5764EF; Thu, 1 Apr 2021 13:54:04 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.33]) by smtp.corp.redhat.com (Postfix) with ESMTP id D1E2C79818 for ; Thu, 1 Apr 2021 13:54:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1617285310; 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=ZOSRNVHLLmThwHe7R0qZYDd2wfPfA5094ZEJwFbgd9U=; b=DRh/3ukwMZaG8fzR18csd6gwXI2HxHYkmGxMlVKwfMuuTpiLNU/J8ITfdmd3SHxqbsTvQK buuvy4wvgw2TW0HYYS2bcj4dyselMAda4P9SC/LCvWsjUnEjjDewPKTGel3oZsFw22+jOz TXxyP6m2EBG0shUPUHpWiFnV98H6qK8= X-MC-Unique: 67WvPGTwNk6FfoylvMP4kg-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 20/39] virshParseRateStr: Refactor cleanup Date: Thu, 1 Apr 2021 15:52:19 +0200 Message-Id: <26e123f92a1143881f4dc83d3eec258cf217e1c1.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.14 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_auto for the string list and remove 'ret' and 'cleanup:'. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- tools/virsh-domain.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 86de4255fa..37be298809 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -848,7 +848,7 @@ static const vshCmdOptDef opts_attach_interface[] =3D { *tok[index] !=3D '\0' && \ virStrToLong_ullp(tok[index], NULL, 10, &rate->name) < 0) { \ vshError(ctl, _("field '%s' is malformed"), #name); \ - goto cleanup; \ + return -1; \ } \ } while (0) @@ -857,16 +857,15 @@ virshParseRateStr(vshControl *ctl, const char *rateStr, virNetDevBandwidthRatePtr rate) { - char **tok =3D NULL; + g_auto(GStrv) tok =3D NULL; size_t ntok; - int ret =3D -1; if (!(tok =3D virStringSplitCount(rateStr, ",", 0, &ntok))) return -1; if (ntok > 4) { vshError(ctl, _("Rate string '%s' has too many fields"), rateStr); - goto cleanup; + return -1; } VIRSH_PARSE_RATE_FIELD(0, average); @@ -874,10 +873,7 @@ virshParseRateStr(vshControl *ctl, VIRSH_PARSE_RATE_FIELD(2, burst); VIRSH_PARSE_RATE_FIELD(3, floor); - ret =3D 0; - cleanup: - g_strfreev(tok); - return ret; + return 0; } #undef VIRSH_PARSE_RATE_FIELD --=20 2.29.2