openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use g_strdup_printf instead of virAsprintf everywhere 

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
This commit is contained in:
Michal Privoznik 2019-10-22 15:48:08 +02:00
parent 26a137093b
commit d36a15f963
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/admin/libvirt-admin.c
View File

@ -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'"),

6
src/driver.c
View File

@ -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);