[libvirt] [PATCH 38/75] bhyve: Use g_strdup_printf() instead of virAsprintf()

[Ján Tomko]

On Tue, Oct 22, 2019 at 03:57:42PM +0200, Michal Privoznik wrote:
>Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
>---
> src/bhyve/bhyve_capabilities.c | 4 ++--
> src/bhyve/bhyve_process.c      | 6 +++---
> 2 files changed, 5 insertions(+), 5 deletions(-)
>
>diff --git a/src/bhyve/bhyve_capabilities.c b/src/bhyve/bhyve_capabilities.c
>index 2f03bd6131..a533692517 100644
>--- a/src/bhyve/bhyve_capabilities.c
>+++ b/src/bhyve/bhyve_capabilities.c
>@@ -159,8 +159,8 @@ virBhyveDomainCapsBuild(bhyveConnPtr conn,
>                 firmwares_alloc, firmwares->nvalues, 1) < 0)
>                 goto cleanup;
>
>-            virAsprintf(&firmwares->values[firmwares->nvalues], "%s/%s",
>-                        firmware_dir, entry->d_name);
>+            firmwares->values[firmwares->nvalues] = g_strdup_printf("%s/%s",
>+                                                                    firmware_dir, entry->d_name);

This results in a very long line

>
>             firmwares->nvalues++;
>         }
>diff --git a/src/bhyve/bhyve_process.c b/src/bhyve/bhyve_process.c
>index 17e32176d9..7e2631f6ea 100644
>--- a/src/bhyve/bhyve_process.c
>+++ b/src/bhyve/bhyve_process.c
>@@ -89,7 +89,7 @@ bhyveNetCleanup(virDomainObjPtr vm)
> static void
> virBhyveFormatDevMapFile(const char *vm_name, char **fn_out)
> {
>-    virAsprintf(fn_out, "%s/grub_bhyve-%s-device.map", BHYVE_STATE_DIR, vm_name);
>+    *fn_out, = g_strdup_printf("%s/grub_bhyve-%s-device.map", BHYVE_STATE_DIR, vm_name);

Stray comma  ^

> }
>
> int

With
[PATCH 04/75] bhyve: Drop virAsprintf() and virAsprintfQuiet() retval checking
absorbed

Reviewed-by: Ján Tomko <jtomko at redhat.com>

Jano
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20191022/c7cfc066/attachment-0001.sig>