[libvirt] [PATCH v2 03/31] conf: Use VIR_AUTO* in virDomainCapsCPUModelsAdd

[Jiri Denemark]

Signed-off-by: Jiri Denemark 
Reviewed-by: Ján Tomko 
---

Notes:
Version 2:
- no change

 src/conf/domain_capabilities.c | 15 +--
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/conf/domain_capabilities.c b/src/conf/domain_capabilities.c
index b0fdd15d6c..3224ec3f52 100644
--- a/src/conf/domain_capabilities.c
+++ b/src/conf/domain_capabilities.c
@@ -246,25 +246,20 @@ virDomainCapsCPUModelsAdd(virDomainCapsCPUModelsPtr 
cpuModels,
   virDomainCapsCPUUsable usable,
   char **blockers)
 {
-char *nameCopy = NULL;
-char **blockersCopy = NULL;
+VIR_AUTOFREE(char *) nameCopy = NULL;
+VIR_AUTOSTRINGLIST blockersCopy = NULL;
 
 if (VIR_STRNDUP(nameCopy, name, nameLen) < 0)
-goto error;
+return -1;
 
 if (virStringListCopy(&blockersCopy, (const char **)blockers) < 0)
-goto error;
+return -1;
 
 if (virDomainCapsCPUModelsAddSteal(cpuModels, &nameCopy,
usable, &blockersCopy) < 0)
-goto error;
+return -1;
 
 return 0;
-
- error:
-VIR_FREE(nameCopy);
-virStringListFree(blockersCopy);
-return -1;
 }
 
 
-- 
2.23.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Re: [libvirt] [PATCH v2 03/31] conf: Use VIR_AUTO* in virDomainCapsCPUModelsAdd

[Ján Tomko]

On Tue, Oct 15, 2019 at 05:34:39PM +0200, Jiri Denemark wrote:

Signed-off-by: Jiri Denemark 
Reviewed-by: Ján Tomko 
---

Notes:
   Version 2:
   - no change

src/conf/domain_capabilities.c | 15 +--
1 file changed, 5 insertions(+), 10 deletions(-)



Reviewed-by: Ján Tomko 
with the following squashed in:

diff --git a/src/conf/domain_capabilities.c b/src/conf/domain_capabilities.c
index 3224ec3f52..a143386d0b 100644
--- a/src/conf/domain_capabilities.c
+++ b/src/conf/domain_capabilities.c
@@ -246,7 +246,7 @@ virDomainCapsCPUModelsAdd(virDomainCapsCPUModelsPtr 
cpuModels,
  virDomainCapsCPUUsable usable,
  char **blockers)
{
-VIR_AUTOFREE(char *) nameCopy = NULL;
+g_autofree char *nameCopy = NULL;
VIR_AUTOSTRINGLIST blockersCopy = NULL;

if (VIR_STRNDUP(nameCopy, name, nameLen) < 0)



signature.asc
Description: PGP signature
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list