[libvirt] [PATCH 52/75] phyp: Use g_strdup_printf() instead of virAsprintf()
Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com>
---
src/phyp/phyp_driver.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c
index 6aa47ac511..bc4e08d198 100644
--- a/src/phyp/phyp_driver.c
+++ b/src/phyp/phyp_driver.c
@@ -504,8 +504,8 @@ phypUUIDTable_Push(virConnectPtr conn)
char *remote_file = NULL;
int ret = -1;
- virAsprintf(&remote_file, "/home/%s/libvirt_uuid_table",
- NULLSTR(conn->uri->user));
+ 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.");
@@ -691,8 +691,8 @@ phypUUIDTable_Pull(virConnectPtr conn)
char *remote_file = NULL;
int ret = -1;
- virAsprintf(&remote_file, "/home/%s/libvirt_uuid_table",
- NULLSTR(conn->uri->user));
+ remote_file = g_strdup_printf("/home/%s/libvirt_uuid_table",
+ NULLSTR(conn->uri->user));
/* Trying to stat the remote file. */
do {
@@ -937,9 +937,9 @@ openSSHSession(virConnectPtr conn, virConnectAuthPtr auth,
if (userhome == NULL)
goto err;
- virAsprintf(&pubkey, "%s/.ssh/id_rsa.pub", userhome);
+ pubkey = g_strdup_printf("%s/.ssh/id_rsa.pub", userhome);
- virAsprintf(&pvtkey, "%s/.ssh/id_rsa", userhome);
+ pvtkey = g_strdup_printf("%s/.ssh/id_rsa", userhome);
if (conn->uri->user != NULL) {
username = g_strdup(conn->uri->user);
@@ -2277,7 +2277,7 @@ phypStorageVolGetPath(virStorageVolPtr vol)
if (!pv)
goto cleanup;
- virAsprintf(&path, "/%s/%s/%s", pv, ret, vol->name);
+ path = g_strdup_printf("/%s/%s/%s", pv, ret, vol->name);
cleanup:
VIR_FREE(ret);
--
2.21.0