提交 183a60aa 编写于 作者: M Michal Privoznik

phyp: Use g_strdup_printf() instead of virAsprintf()

Signed-off-by: NMichal Privoznik <mprivozn@redhat.com>
Reviewed-by: NDaniel Henrique Barboza <danielhb413@gmail.com>
上级 e5caed83
......@@ -500,9 +500,8 @@ phypUUIDTable_Push(virConnectPtr conn)
char *remote_file = NULL;
int ret = -1;
if (virAsprintf(&remote_file, "/home/%s/libvirt_uuid_table",
NULLSTR(conn->uri->user)) < 0)
goto cleanup;
remote_file = g_strdup_printf("/home/%s/libvirt_uuid_table",
NULLSTR(conn->uri->user));
if (stat(local_file, &local_fileinfo) == -1) {
VIR_WARN("Unable to stat local file.");
......@@ -688,9 +687,8 @@ phypUUIDTable_Pull(virConnectPtr conn)
char *remote_file = NULL;
int ret = -1;
if (virAsprintf(&remote_file, "/home/%s/libvirt_uuid_table",
NULLSTR(conn->uri->user)) < 0)
goto cleanup;
remote_file = g_strdup_printf("/home/%s/libvirt_uuid_table",
NULLSTR(conn->uri->user));
/* Trying to stat the remote file. */
do {
......@@ -935,11 +933,9 @@ openSSHSession(virConnectPtr conn, virConnectAuthPtr auth,
if (userhome == NULL)
goto err;
if (virAsprintf(&pubkey, "%s/.ssh/id_rsa.pub", userhome) < 0)
goto err;
pubkey = g_strdup_printf("%s/.ssh/id_rsa.pub", userhome);
if (virAsprintf(&pvtkey, "%s/.ssh/id_rsa", userhome) < 0)
goto err;
pvtkey = g_strdup_printf("%s/.ssh/id_rsa", userhome);
if (conn->uri->user != NULL) {
username = g_strdup(conn->uri->user);
......@@ -2277,8 +2273,7 @@ phypStorageVolGetPath(virStorageVolPtr vol)
if (!pv)
goto cleanup;
if (virAsprintf(&path, "/%s/%s/%s", pv, ret, vol->name) < 0)
goto cleanup;
path = g_strdup_printf("/%s/%s/%s", pv, ret, vol->name);
cleanup:
VIR_FREE(ret);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册