From nobody Sun Feb 8 18:44:47 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.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 205.139.110.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=1571752866; cv=none; d=zoho.com; s=zohoarc; b=TI5xcr2IVP55GfmzOtlr5HoSCqfKvAPR4twz2cxcNP6W1ELxe93I1s+tYAm8nl1FqYgoyK5lEBHKdPyiV/vDjVkcOBLZ8qMUM0hlkr/XgBJ5a0xk7Mdlu50ZrZlzsGyoVuxRwREp98JUCR3K7WJ4QT2G9bBP/faKA/hrhfZYUFA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571752866; 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=J5NpMdwQEhgwbxrVBv2LgybyjGoozMGK7XZFtbavE+0=; b=DXLnCQBskO0lxNZ3Q8IAfKstdMQ+365BSyl7YgptUJjXlU+9xhyyyHXEAlP4kgw/K/wo1Gvi+dECHJEu5LBp7ec8UFk9kLvgo/hjjjrVASpvFro4h58USkiMgXSFW1Eyxfi/O/QZQ1C2YQqO8d+YMVL+fb/fuYaaE6by4jQfP1U= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.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 [205.139.110.120]) by mx.zohomail.com with SMTPS id 1571752866743481.56456760989045; Tue, 22 Oct 2019 07:01:06 -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-360-RomgnUx8PUm7LrjFJP_usA-1; Tue, 22 Oct 2019 10:01:00 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E0564801E5C; 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 9C48152CF; Tue, 22 Oct 2019 14:00:54 +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 3ECC4180BA98; Tue, 22 Oct 2019 14:00:54 +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 x9ME0iwb002652 for ; Tue, 22 Oct 2019 10:00:44 -0400 Received: by smtp.corp.redhat.com (Postfix) id 6DA1060559; Tue, 22 Oct 2019 14:00:43 +0000 (UTC) Received: from moe.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id A2C6060475 for ; Tue, 22 Oct 2019 14:00:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571752865; 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=J5NpMdwQEhgwbxrVBv2LgybyjGoozMGK7XZFtbavE+0=; b=b3H9j0EX9vLvJMcJ2o1yTYoIjFIq/syu+DlMC88K0D59aPPb06REnXgAnbqTUV3YG8lCAU 0MeKFkGedTWQAtMEyYC0geKceq3xbWRchiwb1sNAF8rIKGdEJom6s7g/dU/Hp7rR8JJrmS WaK76os/PUHE/9FquO3CRnIhTmns3mw= From: Michal Privoznik To: libvir-list@redhat.com Date: Tue, 22 Oct 2019 15:57:49 +0200 Message-Id: <4f918e7da08b2ea099a78b39f59853fdeb1992ba.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 45/75] locking: 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.84 on 10.5.11.23 X-MC-Unique: RomgnUx8PUm7LrjFJP_usA-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/locking/lock_daemon.c | 8 ++++---- src/locking/lock_daemon_config.c | 2 +- src/locking/lock_driver_lockd.c | 4 ++-- src/locking/lock_driver_sanlock.c | 8 ++++---- src/locking/lock_manager.c | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/locking/lock_daemon.c b/src/locking/lock_daemon.c index dc23179009..2fa3238794 100644 --- a/src/locking/lock_daemon.c +++ b/src/locking/lock_daemon.c @@ -464,8 +464,8 @@ virLockDaemonUnixSocketPaths(bool privileged, } umask(old_umask); =20 - virAsprintf(sockfile, "%s/virtlockd-sock", rundir); - virAsprintf(adminSockfile, "%s/virtlockd-admin-sock", rundir); + *sockfile =3D g_strdup_printf("%s/virtlockd-sock", rundir); + *adminSockfile =3D g_strdup_printf("%s/virtlockd-admin-sock", rund= ir); =20 VIR_FREE(rundir); } @@ -841,7 +841,7 @@ virLockDaemonExecRestartStatePath(bool privileged, } umask(old_umask); =20 - virAsprintf(state_file, "%s/virtlockd-restart-exec.json", rundir); + *state_file =3D g_strdup_printf("%s/virtlockd-restart-exec.json", = rundir); =20 VIR_FREE(rundir); } @@ -858,7 +858,7 @@ virLockDaemonGetExecRestartMagic(void) { char *ret; =20 - virAsprintf(&ret, "%lld", (long long int)getpid()); + ret =3D g_strdup_printf("%lld", (long long int)getpid()); return ret; } =20 diff --git a/src/locking/lock_daemon_config.c b/src/locking/lock_daemon_con= fig.c index e77e2b7bf6..d7e13013d7 100644 --- a/src/locking/lock_daemon_config.c +++ b/src/locking/lock_daemon_config.c @@ -46,7 +46,7 @@ virLockDaemonConfigFilePath(bool privileged, char **confi= gfile) if (!(configdir =3D virGetUserConfigDirectory())) goto error; =20 - virAsprintf(configfile, "%s/virtlockd.conf", configdir); + *configfile =3D g_strdup_printf("%s/virtlockd.conf", configdir); VIR_FREE(configdir); } =20 diff --git a/src/locking/lock_driver_lockd.c b/src/locking/lock_driver_lock= d.c index 73f699044b..e8f0329b05 100644 --- a/src/locking/lock_driver_lockd.c +++ b/src/locking/lock_driver_lockd.c @@ -127,7 +127,7 @@ static char *virLockManagerLockDaemonPath(bool privileg= ed) if (!(rundir =3D virGetUserRuntimeDirectory())) return NULL; =20 - virAsprintf(&path, "%s/virtlockd-sock", rundir); + path =3D g_strdup_printf("%s/virtlockd-sock", rundir); =20 VIR_FREE(rundir); } @@ -574,7 +574,7 @@ static int virLockManagerLockDaemonAddResource(virLockM= anagerPtr lock, _("Missing path or lockspace for lease resource= ")); goto cleanup; } - virAsprintf(&newLockspace, "%s/%s", path, lockspace); + newLockspace =3D g_strdup_printf("%s/%s", path, lockspace); newName =3D g_strdup(name); =20 } break; diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sa= nlock.c index 55f0a3621d..31fbfb5d7e 100644 --- a/src/locking/lock_driver_sanlock.c +++ b/src/locking/lock_driver_sanlock.c @@ -103,7 +103,7 @@ virLockManagerSanlockError(int err, #if HAVE_SANLOCK_STRERROR *message =3D g_strdup(sanlock_strerror(err)); #else - virAsprintf(message, _("sanlock error %d"), err); + message =3D g_strdup_printf(_("sanlock error %d"), err); #endif return true; } else { @@ -211,8 +211,8 @@ virLockManagerSanlockSetupLockspace(virLockManagerSanlo= ckDriverPtr driver) char *dir =3D NULL; int retries =3D LOCKSPACE_RETRIES; =20 - virAsprintf(&path, "%s/%s", driver->autoDiskLeasePath, - VIR_LOCK_MANAGER_SANLOCK_AUTO_DISK_LOCKSPACE); + path =3D g_strdup_printf("%s/%s", driver->autoDiskLeasePath, + VIR_LOCK_MANAGER_SANLOCK_AUTO_DISK_LOCKSPACE); =20 if (virStrcpyStatic(ls.name, VIR_LOCK_MANAGER_SANLOCK_AUTO_DISK_LOCKSPACE) < 0)= { @@ -643,7 +643,7 @@ virLockManagerSanlockAddDisk(virLockManagerSanlockDrive= rPtr driver, goto cleanup; } =20 - virAsprintf(&path, "%s/%s", driver->autoDiskLeasePath, res->name); + path =3D g_strdup_printf("%s/%s", driver->autoDiskLeasePath, res->name= ); if (virStrcpy(res->disks[0].path, path, SANLK_PATH_LEN) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Lease path '%s' exceeds %d characters"), diff --git a/src/locking/lock_manager.c b/src/locking/lock_manager.c index 0986cafe6c..07318fb53f 100644 --- a/src/locking/lock_manager.c +++ b/src/locking/lock_manager.c @@ -131,7 +131,7 @@ virLockManagerPluginPtr virLockManagerPluginNew(const c= har *name, VIR_DEBUG("name=3D%s driverName=3D%s configDir=3D%s flags=3D0x%x", name, driverName, configDir, flags); =20 - virAsprintf(&configFile, "%s/%s-%s.conf", configDir, driverName, name); + configFile =3D g_strdup_printf("%s/%s-%s.conf", configDir, driverName,= name); =20 if (STREQ(name, "nop")) { driver =3D &virLockDriverNop; --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list