From e5caed83bd8ad259f4735a21ea9c532a91bae4ae Mon Sep 17 00:00:00 2001
From: Michal Privoznik <mprivozn@redhat.com>
Date: Tue, 22 Oct 2019 15:26:14 +0200
Subject: [PATCH] openvz: Use g_strdup_printf() instead of virAsprintf()

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
---
 src/openvz/openvz_conf.c   | 18 ++++++------------
 src/openvz/openvz_driver.c |  7 +++----
 2 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/src/openvz/openvz_conf.c b/src/openvz/openvz_conf.c
index 4646308c48..7676656af1 100644
--- a/src/openvz/openvz_conf.c
+++ b/src/openvz/openvz_conf.c
@@ -362,8 +362,7 @@ openvzReadFSConf(virDomainDefPtr def,
         if (VIR_ALLOC(fs) < 0)
             goto error;
 
-        if (virAsprintf(&veid_str, "%d", veid) < 0)
-            goto error;
+        veid_str = g_strdup_printf("%d", veid);
 
         fs->type = VIR_DOMAIN_FS_TYPE_MOUNT;
         if (!(fs->src->path = virStringReplace(temp, "$VEID", veid_str)))
@@ -534,8 +533,7 @@ int openvzLoadDomains(struct openvz_driver *driver)
             def->id = -1;
         else
             def->id = veid;
-        if (virAsprintf(&def->name, "%i", veid) < 0)
-            goto cleanup;
+        def->name = g_strdup_printf("%i", veid);
 
         openvzGetVPSUUID(veid, uuidstr, sizeof(uuidstr));
         ret = virUUIDParse(uuidstr, def->uuid);
@@ -626,8 +624,7 @@ openvzWriteConfigParam(const char * conf_file, const char *param, const char *va
     char *line = NULL;
     size_t line_size = 0;
 
-    if (virAsprintf(&temp_file, "%s.tmp", conf_file)<0)
-        return -1;
+    temp_file = g_strdup_printf("%s.tmp", conf_file);
 
     fp = fopen(conf_file, "r");
     if (fp == NULL)
@@ -823,9 +820,8 @@ openvzCopyDefaultConfig(int vpsid)
     if (confdir == NULL)
         goto cleanup;
 
-    if (virAsprintf(&default_conf_file, "%s/ve-%s.conf-sample", confdir,
-                    configfile_value) < 0)
-        goto cleanup;
+    default_conf_file = g_strdup_printf("%s/ve-%s.conf-sample", confdir,
+                                        configfile_value);
 
     if (openvzLocateConfFile(vpsid, &conf_file, "conf") < 0)
         goto cleanup;
@@ -855,9 +851,7 @@ openvzLocateConfFileDefault(int vpsid, char **conffile, const char *ext)
     if (confdir == NULL)
         return -1;
 
-    if (virAsprintf(conffile, "%s/%d.%s", confdir, vpsid,
-                    ext ? ext : "conf") < 0)
-        ret = -1;
+    *conffile = g_strdup_printf("%s/%d.%s", confdir, vpsid, ext ? ext : "conf");
 
     VIR_FREE(confdir);
     return ret;
diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c
index 017eec3081..8a24c9265f 100644
--- a/src/openvz/openvz_driver.c
+++ b/src/openvz/openvz_driver.c
@@ -702,7 +702,7 @@ openvzGenerateVethName(int veid, char *dev_name_ve)
 
     if (sscanf(dev_name_ve, "%*[^0-9]%d", &ifNo) != 1)
         return NULL;
-    ignore_value(virAsprintf(&ret, "veth%d.%d.", veid, ifNo));
+    ret = g_strdup_printf("veth%d.%d.", veid, ifNo);
     return ret;
 }
 
@@ -729,7 +729,7 @@ openvzGenerateContainerVethName(int veid)
         }
 
         /* set new name */
-        ignore_value(virAsprintf(&name, "eth%d", max + 1));
+        name = g_strdup_printf("eth%d", max + 1);
     }
 
     VIR_FREE(temp);
@@ -2207,8 +2207,7 @@ openvzDomainMigratePrepare3Params(virConnectPtr dconn,
         }
     }
 
-    if (virAsprintf(uri_out, "ssh://%s", hostname) < 0)
-        goto error;
+    *uri_out = g_strdup_printf("ssh://%s", hostname);
 
     ret = 0;
     goto done;
-- 
GitLab