From nobody Sun Feb 8 21:33:26 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.120 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=1571752733; cv=none; d=zoho.com; s=zohoarc; b=e2WoZxqPd6aA4OlWs745gs8xra+NOaqvAqMArZnHOcbFrKLXONDgJZ3PQ/a22RSXIgOHMyyHi2Mm6ETUtjOFYrbrhoRW0L7A8URi10fRppnWeV7wLOWa99qU2p1kcZxkBFEdkQR0dPYcK/4AIp6+VyB1zMu3LJbABPuC6L+Mh8Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571752733; 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=BQFHmdIiOkJRz1f30vx7d7am9vDhi7dKbjHNK5CvZec=; b=LLnTM1Wxo6/X3pGeCy/ZacfQMqfSu9ok+YcZKb5gkM/fAIZe9tUkfUDuP7c6N7aLzuBg6WPRy6fUq4T3eKovaoYLy3uGpq4Nm03L52n+qRsbuUgDsjsixUgxxZa7mybru73TiItgnd3Q3I/oQNmjhA2kFCQMpWznNh+i9RT+pU0= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.120 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-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 1571752733654791.76954193522; Tue, 22 Oct 2019 06:58:53 -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-357-ro6xFKA4OuWywLwxmnkzlg-1; Tue, 22 Oct 2019 09:58:50 -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 DEDE9800D56; Tue, 22 Oct 2019 13:58:44 +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 B94FF5C219; Tue, 22 Oct 2019 13:58:44 +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 769194EEB9; Tue, 22 Oct 2019 13:58:44 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9MDwf14001655 for ; Tue, 22 Oct 2019 09:58:41 -0400 Received: by smtp.corp.redhat.com (Postfix) id 3122E60161; Tue, 22 Oct 2019 13:58:41 +0000 (UTC) Received: from moe.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id AEA606012C for ; Tue, 22 Oct 2019 13:58:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571752732; 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=BQFHmdIiOkJRz1f30vx7d7am9vDhi7dKbjHNK5CvZec=; b=TdCRpUXCan0q/s+RW5u74VL+IZX1KDXgkhGWSwShhJk5aD2YkiABcIP+GKISyVnVEjJAw8 ZxrzwPMc/SvDb2IxGLiA7LB1QIh/HwY70hvoHubadcTnYeAIzFzfD5HvAXsJVNWNinN1mf etSWNGjnrnXU2imdM2XLum9LS+Tg8jg= From: Michal Privoznik To: libvir-list@redhat.com Date: Tue, 22 Oct 2019 15:57:18 +0200 Message-Id: <73cacb252408f25333cb50cfae5465aa3bcbc722.1571752582.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 14/75] network: Drop virAsprintf() and virAsprintfQuiet() retval checking 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 X-MC-Unique: ro6xFKA4OuWywLwxmnkzlg-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" These functions can't fail really. Drop checking of their retval then. Signed-off-by: Michal Privoznik --- src/network/bridge_driver.c | 69 ++++++++++++++++--------------------- src/network/leaseshelper.c | 6 ++-- 2 files changed, 31 insertions(+), 44 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index fcaa6a48ae..b82a371fe4 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -371,8 +371,7 @@ networkDnsmasqLeaseFileNameDefault(virNetworkDriverStat= ePtr driver, { char *leasefile; =20 - ignore_value(virAsprintf(&leasefile, "%s/%s.leases", - driver->dnsmasqStateDir, netname)); + virAsprintf(&leasefile, "%s/%s.leases", driver->dnsmasqStateDir, netna= me); return leasefile; } =20 @@ -383,8 +382,7 @@ networkDnsmasqLeaseFileNameCustom(virNetworkDriverState= Ptr driver, { char *leasefile; =20 - ignore_value(virAsprintf(&leasefile, "%s/%s.status", - driver->dnsmasqStateDir, bridge)); + virAsprintf(&leasefile, "%s/%s.status", driver->dnsmasqStateDir, bridg= e); return leasefile; } =20 @@ -395,8 +393,7 @@ networkDnsmasqConfigFileName(virNetworkDriverStatePtr d= river, { char *conffile; =20 - ignore_value(virAsprintf(&conffile, "%s/%s.conf", - driver->dnsmasqStateDir, netname)); + virAsprintf(&conffile, "%s/%s.conf", driver->dnsmasqStateDir, netname); return conffile; } =20 @@ -407,7 +404,7 @@ networkRadvdPidfileBasename(const char *netname) /* this is simple but we want to be sure it's consistently done */ char *pidfilebase; =20 - ignore_value(virAsprintf(&pidfilebase, "%s-radvd", netname)); + virAsprintf(&pidfilebase, "%s-radvd", netname); return pidfilebase; } =20 @@ -418,8 +415,7 @@ networkRadvdConfigFileName(virNetworkDriverStatePtr dri= ver, { char *configfile; =20 - ignore_value(virAsprintf(&configfile, "%s/%s-radvd.conf", - driver->radvdStateDir, netname)); + virAsprintf(&configfile, "%s/%s-radvd.conf", driver->radvdStateDir, ne= tname); return configfile; } =20 @@ -515,13 +511,13 @@ networkBridgeDummyNicName(const char *brname) * a possible numeric ending (eg virbr0, virbr1, etc), we grab * the first 8 and last 3 characters of the string. */ - ignore_value(virAsprintf(&nicname, "%.*s%s%s", - /* space for last 3 chars + "-nic" + NULL= */ - (int)(IFNAMSIZ - (3 + sizeof(dummyNicSuff= ix))), - brname, brname + strlen(brname) - 3, - dummyNicSuffix)); + virAsprintf(&nicname, "%.*s%s%s", + /* space for last 3 chars + "-nic" + NULL */ + (int)(IFNAMSIZ - (3 + sizeof(dummyNicSuffix))), + brname, brname + strlen(brname) - 3, + dummyNicSuffix); } else { - ignore_value(virAsprintf(&nicname, "%s%s", brname, dummyNicSuffix)= ); + virAsprintf(&nicname, "%s%s", brname, dummyNicSuffix); } return nicname; } @@ -751,20 +747,18 @@ networkStateInitialize(bool privileged, if (!(configdir && rundir)) goto error; =20 - if ((virAsprintf(&network_driver->networkConfigDir, - "%s/qemu/networks", configdir) < 0) || - (virAsprintf(&network_driver->networkAutostartDir, - "%s/qemu/networks/autostart", configdir) < 0) || - (virAsprintf(&network_driver->stateDir, - "%s/network/lib", rundir) < 0) || - (virAsprintf(&network_driver->pidDir, - "%s/network/run", rundir) < 0) || - (virAsprintf(&network_driver->dnsmasqStateDir, - "%s/dnsmasq/lib", rundir) < 0) || - (virAsprintf(&network_driver->radvdStateDir, - "%s/radvd/lib", rundir) < 0)) { - goto error; - } + virAsprintf(&network_driver->networkConfigDir, + "%s/qemu/networks", configdir); + virAsprintf(&network_driver->networkAutostartDir, + "%s/qemu/networks/autostart", configdir); + virAsprintf(&network_driver->stateDir, + "%s/network/lib", rundir); + virAsprintf(&network_driver->pidDir, + "%s/network/run", rundir); + virAsprintf(&network_driver->dnsmasqStateDir, + "%s/dnsmasq/lib", rundir); + virAsprintf(&network_driver->radvdStateDir, + "%s/radvd/lib", rundir); } =20 if (virFileMakePath(network_driver->stateDir) < 0) { @@ -2300,9 +2294,8 @@ networkSetIPv6Sysctls(virNetworkObjPtr obj) * network. But also unset it if there *are* ipv6 addresses, as we * can't be sure of its default value. */ - if (virAsprintf(&field, SYSCTL_PATH "/net/ipv6/conf/%s/disable_ipv6", - def->bridge) < 0) - goto cleanup; + virAsprintf(&field, SYSCTL_PATH "/net/ipv6/conf/%s/disable_ipv6", + def->bridge); =20 if (access(field, W_OK) < 0 && errno =3D=3D ENOENT) { if (!enableIPv6) @@ -2327,9 +2320,8 @@ networkSetIPv6Sysctls(virNetworkObjPtr obj) /* Prevent guests from hijacking the host network by sending out * their own router advertisements. */ - if (virAsprintf(&field, SYSCTL_PATH "/net/ipv6/conf/%s/accept_ra", - def->bridge) < 0) - goto cleanup; + virAsprintf(&field, SYSCTL_PATH "/net/ipv6/conf/%s/accept_ra", + def->bridge); =20 if (virFileWriteStr(field, "0", 0) < 0) { virReportSystemError(errno, @@ -2341,9 +2333,7 @@ networkSetIPv6Sysctls(virNetworkObjPtr obj) /* All interfaces used as a gateway (which is what this is, by * definition), must always have autoconf=3D0. */ - if (virAsprintf(&field, SYSCTL_PATH "/net/ipv6/conf/%s/autoconf", - def->bridge) < 0) - goto cleanup; + virAsprintf(&field, SYSCTL_PATH "/net/ipv6/conf/%s/autoconf", def->bri= dge); =20 if (virFileWriteStr(field, "0", 0) < 0) { virReportSystemError(errno, @@ -3328,8 +3318,7 @@ networkFindUnusedBridgeName(virNetworkObjListPtr nets, templ =3D def->bridge; =20 do { - if (virAsprintf(&newname, templ, id) < 0) - goto cleanup; + virAsprintf(&newname, templ, id); /* check if this name is used in another libvirt network or * there is an existing device with that name. ignore errors * from virNetDevExists(), just in case it isn't implemented diff --git a/src/network/leaseshelper.c b/src/network/leaseshelper.c index 93dd2ca48a..008a2d668d 100644 --- a/src/network/leaseshelper.c +++ b/src/network/leaseshelper.c @@ -153,10 +153,8 @@ main(int argc, char **argv) =20 server_duid =3D g_strdup(getenv("DNSMASQ_SERVER_DUID")); =20 - if (virAsprintf(&custom_lease_file, - LOCALSTATEDIR "/lib/libvirt/dnsmasq/%s.status", - interface) < 0) - goto cleanup; + virAsprintf(&custom_lease_file, + LOCALSTATEDIR "/lib/libvirt/dnsmasq/%s.status", interface); =20 pid_file =3D g_strdup(RUNSTATEDIR "/leaseshelper.pid"); =20 --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list