From d36a15f96339d81a87152b321d47446140fe21ae Mon Sep 17 00:00:00 2001 From: Michal Privoznik Date: Tue, 22 Oct 2019 15:48:08 +0200 Subject: [PATCH] Use g_strdup_printf instead of virAsprintf everywhere Signed-off-by: Michal Privoznik Reviewed-by: Daniel Henrique Barboza --- src/admin/libvirt-admin.c | 12 +++++------- src/driver.c | 6 ++---- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/src/admin/libvirt-admin.c b/src/admin/libvirt-admin.c index 9a18ea0f8b..f156736d9f 100644 --- a/src/admin/libvirt-admin.c +++ b/src/admin/libvirt-admin.c @@ -141,18 +141,16 @@ getSocketPath(virURIPtr uri) if (legacy) { sockbase = g_strdup("libvirt-admin-sock"); } else { - if (virAsprintf(&sockbase, "%s-admin-sock", uri->scheme) < 0) - goto error; + sockbase = g_strdup_printf("%s-admin-sock", uri->scheme); } if (STREQ_NULLABLE(uri->path, "/system")) { - if (virAsprintf(&sock_path, RUNSTATEDIR "/libvirt/%s", - sockbase) < 0) - goto error; + sock_path = g_strdup_printf(RUNSTATEDIR "/libvirt/%s", sockbase); } else if (STREQ_NULLABLE(uri->path, "/session")) { - if (!rundir || virAsprintf(&sock_path, "%s/%s", rundir, - sockbase) < 0) + if (!rundir) goto error; + + sock_path = g_strdup_printf("%s/%s", rundir, sockbase); } else { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Invalid URI path '%s', try '/system'"), diff --git a/src/driver.c b/src/driver.c index 125cf02890..2392fd7d5f 100644 --- a/src/driver.c +++ b/src/driver.c @@ -90,8 +90,7 @@ virDriverShouldAutostart(const char *dir, *autostart = false; - if (virAsprintf(&path, "%s/autostarted", dir) < 0) - return -1; + path = g_strdup_printf("%s/autostarted", dir); if (virFileExists(path)) { VIR_DEBUG("Autostart file %s exists, skipping autostart", path); @@ -152,8 +151,7 @@ virGetConnectGeneric(virThreadLocalPtr threadPtr, const char *name) g_autofree char *uri = NULL; const char *uriPath = geteuid() == 0 ? "/system" : "/session"; - if (virAsprintf(&uri, "%s://%s", name, uriPath) < 0) - return NULL; + uri = g_strdup_printf("%s://%s", name, uriPath); conn = virConnectOpen(uri); VIR_DEBUG("Opened new %s connection %p", name, conn);