From nobody Mon Feb 9 23:43:04 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=1641993098; cv=none; d=zohomail.com; s=zohoarc; b=WlMbKPkARdcXbpGIAbQSXOBcOCpZv9Hhz9RfPTDnCIII8lA7jJH2W2RpyewNe7GAi6ZDq5VMVn4tR1KHNJ3I0vJ3jCDYlm2MvDiurJWK6ydllrRGt7fjdljft7S64W5wWqNU3XyNdpnSCJtsfpQL1OV0N/mA7xxPCnkh20LYUSQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1641993098; h=Content-Type:Content-Transfer-Encoding:Cc: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=KSeH+xp2fSNEnHvRMNB9np4MzrINTuHsspW10rPt/p8=; b=Yk3vybFQiMr27axew5mw1Wns/SvMExBtGvyXuIoiFRIRjtShH/Am1dnjFLxUnZcLb29Vb9Ez+h3BpRXP5JVYPBksX1g4ohWocbamMWw8zp0AQ5ZMQDgtTWImiKdio26bx+EiosqprTsUzl1S1uP9jMpynMaQiMwZOSnA3tBLhqU= 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 1641993098297246.97287818534062; Wed, 12 Jan 2022 05:11:38 -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-533-eHXheYxzNkWVLADO4oCohA-1; Wed, 12 Jan 2022 08:11:34 -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 BABA8835E20; Wed, 12 Jan 2022 13:11:28 +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 9567070D32; Wed, 12 Jan 2022 13:11:28 +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 627084BB7C; Wed, 12 Jan 2022 13:11:28 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 20CDBRvF004461 for ; Wed, 12 Jan 2022 08:11:27 -0500 Received: by smtp.corp.redhat.com (Postfix) id DD39E26379; Wed, 12 Jan 2022 13:11:27 +0000 (UTC) Received: from work.speedport.ip (unknown [10.39.193.168]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2820526370; Wed, 12 Jan 2022 13:11:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1641993097; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc: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=KSeH+xp2fSNEnHvRMNB9np4MzrINTuHsspW10rPt/p8=; b=TiKkbQ/deGA254y7t9qs10K+NV3XMVm6Xy/UOCkNXqmx4LAKIGB55neiY9XIVjNcUKgfZ9 /EC3nmPiXSUWehmtZ9E913oBlaewEN0J92+oyJy4YiJhixRS0jMBeqpahGTvp9hgHOzapF xtE9qrwDlRUR0uffQjmrPzjEzeh+L2E= X-MC-Unique: eHXheYxzNkWVLADO4oCohA-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 10/14] virInterfaceDefParseProtoIPv4: Simplify and cleanup Date: Wed, 12 Jan 2022 14:10:11 +0100 Message-Id: <20220112131015.100288-11-twiederh@redhat.com> In-Reply-To: <20220112131015.100288-1-twiederh@redhat.com> References: <20220112131015.100288-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com Cc: Tim Wiederhake 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: 1641993100412100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Tim Wiederhake --- src/conf/interface_conf.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/conf/interface_conf.c b/src/conf/interface_conf.c index bfeb69e664..c41eecac29 100644 --- a/src/conf/interface_conf.c +++ b/src/conf/interface_conf.c @@ -266,10 +266,8 @@ virInterfaceDefParseProtoIPv4(virInterfaceProtocolDef = *def, g_autofree xmlNodePtr *ipNodes =3D NULL; int nipNodes; size_t i; - char *tmp; =20 - tmp =3D virXPathString("string(./route[1]/@gateway)", ctxt); - def->gateway =3D tmp; + def->gateway =3D virXPathString("string(./route[1]/@gateway)", ctxt); =20 dhcp =3D virXPathNode("./dhcp", ctxt); if (dhcp !=3D NULL) { @@ -287,10 +285,7 @@ virInterfaceDefParseProtoIPv4(virInterfaceProtocolDef = *def, =20 def->nips =3D 0; for (i =3D 0; i < nipNodes; i++) { - - virInterfaceIPDef *ip; - - ip =3D g_new0(virInterfaceIPDef, 1); + virInterfaceIPDef *ip =3D g_new0(virInterfaceIPDef, 1); =20 if (virInterfaceDefParseIP(ip, ipNodes[i]) < 0) { virInterfaceIPDefFree(ip); --=20 2.31.1