From nobody Sun Feb 8 19:59:40 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=1571752905; cv=none; d=zoho.com; s=zohoarc; b=oREBfuDmGmbgBDMheJcCTFTWi8ERbbT025Ot7dnXTQWKqEIOnWYxgedGEK4TjFATVYLG1rM6x5G65sNbJ1DLxWs9di/M40IStND+sLtw5VDFLKMGqu/Tp6Sb8L7/qnAXhUAxiU7ffqLEklAXVoC2y0dO8+m6XPw08juhzC3xYdk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571752905; 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=WgV1oFpyIJ5eCLfxoeJCL2lqxecg2OWwCmaNwmQNaB4=; b=BNbYbJCdpJ4UKVKaDMcgPVL1HZilkHqlQKsOg3BSPlXzKCOP4WrVP/+90SHPnixJChAJ9iJN9RZ0zoQUVRuVmdQCaa3XYtXZkCmbHZfFDnd8lRtIkdbhGJnq435kYt1hLIJiVR8zNPIMb9NxKwT2T1MUfaXihIBRxXFY8EK/A4M= 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 1571752905664124.67327322142398; Tue, 22 Oct 2019 07:01:45 -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-183-sMOzgn9JPAiZvjdfBWRAIw-1; Tue, 22 Oct 2019 10:01:00 -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 386521005526; Tue, 22 Oct 2019 14:00:54 +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 E54655C22C; Tue, 22 Oct 2019 14:00:53 +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 83CD6180BA98; Tue, 22 Oct 2019 14:00:53 +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 x9ME0krV002681 for ; Tue, 22 Oct 2019 10:00:46 -0400 Received: by smtp.corp.redhat.com (Postfix) id 0A45460475; Tue, 22 Oct 2019 14:00:46 +0000 (UTC) Received: from moe.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 51D08620AD for ; Tue, 22 Oct 2019 14:00:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571752904; 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=WgV1oFpyIJ5eCLfxoeJCL2lqxecg2OWwCmaNwmQNaB4=; b=OQfkGXKfywg3iBWD77IjVRcR4ual0s30yLMlZE0d9NWARQVcX4LgdzpWIxnh+MpNqXbpTL u4NMHpzR92Dc48dQV664+DCrxKgkDFliGKALoYUMftW3GyKJe5LhzHhlfefAQ8LHL6HxCj tJJ5Bt1DqoPIgjgAwqr+nYvl47yYQDk= From: Michal Privoznik To: libvir-list@redhat.com Date: Tue, 22 Oct 2019 15:57:52 +0200 Message-Id: <49f7a600f00697291ceee365ab56c802e03d983d.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 48/75] network: Use g_strdup_printf() instead of virAsprintf() 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: sMOzgn9JPAiZvjdfBWRAIw-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" Signed-off-by: Michal Privoznik Reviewed-by: Daniel Henrique Barboza --- src/network/bridge_driver.c | 58 ++++++++++++++++++------------------- src/network/leaseshelper.c | 4 +-- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index b82a371fe4..5d424e3681 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -371,7 +371,7 @@ networkDnsmasqLeaseFileNameDefault(virNetworkDriverStat= ePtr driver, { char *leasefile; =20 - virAsprintf(&leasefile, "%s/%s.leases", driver->dnsmasqStateDir, netna= me); + leasefile =3D g_strdup_printf("%s/%s.leases", driver->dnsmasqStateDir,= netname); return leasefile; } =20 @@ -382,7 +382,7 @@ networkDnsmasqLeaseFileNameCustom(virNetworkDriverState= Ptr driver, { char *leasefile; =20 - virAsprintf(&leasefile, "%s/%s.status", driver->dnsmasqStateDir, bridg= e); + leasefile =3D g_strdup_printf("%s/%s.status", driver->dnsmasqStateDir,= bridge); return leasefile; } =20 @@ -393,7 +393,7 @@ networkDnsmasqConfigFileName(virNetworkDriverStatePtr d= river, { char *conffile; =20 - virAsprintf(&conffile, "%s/%s.conf", driver->dnsmasqStateDir, netname); + conffile =3D g_strdup_printf("%s/%s.conf", driver->dnsmasqStateDir, ne= tname); return conffile; } =20 @@ -404,7 +404,7 @@ networkRadvdPidfileBasename(const char *netname) /* this is simple but we want to be sure it's consistently done */ char *pidfilebase; =20 - virAsprintf(&pidfilebase, "%s-radvd", netname); + pidfilebase =3D g_strdup_printf("%s-radvd", netname); return pidfilebase; } =20 @@ -415,7 +415,7 @@ networkRadvdConfigFileName(virNetworkDriverStatePtr dri= ver, { char *configfile; =20 - virAsprintf(&configfile, "%s/%s-radvd.conf", driver->radvdStateDir, ne= tname); + configfile =3D g_strdup_printf("%s/%s-radvd.conf", driver->radvdStateD= ir, netname); return configfile; } =20 @@ -511,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. */ - virAsprintf(&nicname, "%.*s%s%s", - /* space for last 3 chars + "-nic" + NULL */ - (int)(IFNAMSIZ - (3 + sizeof(dummyNicSuffix))), - brname, brname + strlen(brname) - 3, - dummyNicSuffix); + nicname =3D g_strdup_printf("%.*s%s%s", + /* space for last 3 chars + "-nic" + NUL= L */ + (int)(IFNAMSIZ - (3 + sizeof(dummyNicSuf= fix))), + brname, brname + strlen(brname) - 3, + dummyNicSuffix); } else { - virAsprintf(&nicname, "%s%s", brname, dummyNicSuffix); + nicname =3D g_strdup_printf("%s%s", brname, dummyNicSuffix); } return nicname; } @@ -747,18 +747,18 @@ networkStateInitialize(bool privileged, if (!(configdir && rundir)) goto error; =20 - 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); + network_driver->networkConfigDir =3D g_strdup_printf( + "%s/qemu/networ= ks", configdir); + network_driver->networkAutostartDir =3D g_strdup_printf( + "%s/qemu/net= works/autostart", configdir); + network_driver->stateDir =3D g_strdup_printf( + "%s/network/lib", rundi= r); + network_driver->pidDir =3D g_strdup_printf( + "%s/network/run", rundir); + network_driver->dnsmasqStateDir =3D g_strdup_printf( + "%s/dnsmasq/lib"= , rundir); + network_driver->radvdStateDir =3D g_strdup_printf( + "%s/radvd/lib", ru= ndir); } =20 if (virFileMakePath(network_driver->stateDir) < 0) { @@ -2294,8 +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. */ - virAsprintf(&field, SYSCTL_PATH "/net/ipv6/conf/%s/disable_ipv6", - def->bridge); + field =3D g_strdup_printf(SYSCTL_PATH "/net/ipv6/conf/%s/disable_ipv6", + def->bridge); =20 if (access(field, W_OK) < 0 && errno =3D=3D ENOENT) { if (!enableIPv6) @@ -2320,8 +2320,8 @@ networkSetIPv6Sysctls(virNetworkObjPtr obj) /* Prevent guests from hijacking the host network by sending out * their own router advertisements. */ - virAsprintf(&field, SYSCTL_PATH "/net/ipv6/conf/%s/accept_ra", - def->bridge); + field =3D g_strdup_printf(SYSCTL_PATH "/net/ipv6/conf/%s/accept_ra", + def->bridge); =20 if (virFileWriteStr(field, "0", 0) < 0) { virReportSystemError(errno, @@ -2333,7 +2333,7 @@ networkSetIPv6Sysctls(virNetworkObjPtr obj) /* All interfaces used as a gateway (which is what this is, by * definition), must always have autoconf=3D0. */ - virAsprintf(&field, SYSCTL_PATH "/net/ipv6/conf/%s/autoconf", def->bri= dge); + field =3D g_strdup_printf(SYSCTL_PATH "/net/ipv6/conf/%s/autoconf", de= f->bridge); =20 if (virFileWriteStr(field, "0", 0) < 0) { virReportSystemError(errno, @@ -3318,7 +3318,7 @@ networkFindUnusedBridgeName(virNetworkObjListPtr nets, templ =3D def->bridge; =20 do { - virAsprintf(&newname, templ, id); + newname =3D g_strdup_printf(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 008a2d668d..3058a3c038 100644 --- a/src/network/leaseshelper.c +++ b/src/network/leaseshelper.c @@ -153,8 +153,8 @@ main(int argc, char **argv) =20 server_duid =3D g_strdup(getenv("DNSMASQ_SERVER_DUID")); =20 - virAsprintf(&custom_lease_file, - LOCALSTATEDIR "/lib/libvirt/dnsmasq/%s.status", interface); + custom_lease_file =3D g_strdup_printf( + LOCALSTATEDIR "/lib/libvirt/dnsmas= q/%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