virHashNew refactorings - part VII

[libvirt PATCH 37/38] virStoragePoolObjListNew: `virHashNew` cannot return NULL

Posted by Tim Wiederhake 4 years, 6 months ago

Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
---
 src/conf/virstorageobj.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/conf/virstorageobj.c b/src/conf/virstorageobj.c
index 24957d6012..6c8a06e8bc 100644
--- a/src/conf/virstorageobj.c
+++ b/src/conf/virstorageobj.c
@@ -401,12 +401,8 @@ virStoragePoolObjListNew(void)
     if (!(pools = virObjectRWLockableNew(virStoragePoolObjListClass)))
         return NULL;
 
-    if (!(pools->objs = virHashNew(virObjectFreeHashData)) ||
-        !(pools->objsName = virHashNew(virObjectFreeHashData))) {
-        virObjectUnref(pools);
-        return NULL;
-    }
-
+    pools->objs = virHashNew(virObjectFreeHashData);
+    pools->objsName = virHashNew(virObjectFreeHashData);
     return pools;
 }
 
-- 
2.31.1

Re: [libvirt PATCH 37/38] virStoragePoolObjListNew: `virHashNew` cannot return NULL

Posted by Peter Krempa 4 years, 6 months ago

On Thu, Jul 22, 2021 at 09:50:29 +0200, Tim Wiederhake wrote:
> Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
> ---
>  src/conf/virstorageobj.c | 8 ++------
>  1 file changed, 2 insertions(+), 6 deletions(-)
> 
> diff --git a/src/conf/virstorageobj.c b/src/conf/virstorageobj.c
> index 24957d6012..6c8a06e8bc 100644
> --- a/src/conf/virstorageobj.c
> +++ b/src/conf/virstorageobj.c
> @@ -401,12 +401,8 @@ virStoragePoolObjListNew(void)
>      if (!(pools = virObjectRWLockableNew(virStoragePoolObjListClass)))
>          return NULL;
>  
> -    if (!(pools->objs = virHashNew(virObjectFreeHashData)) ||
> -        !(pools->objsName = virHashNew(virObjectFreeHashData))) {
> -        virObjectUnref(pools);
> -        return NULL;
> -    }
> -
> +    pools->objs = virHashNew(virObjectFreeHashData);
> +    pools->objsName = virHashNew(virObjectFreeHashData);

Preferrably keep the newline before 'return'.

>      return pools;
>  }
>  
> -- 
> 2.31.1
>