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

Peter Krempa pkrempa at redhat.com
Fri Jul 23 08:24:40 UTC 2021


On Thu, Jul 22, 2021 at 09:50:29 +0200, Tim Wiederhake wrote:
> Signed-off-by: Tim Wiederhake <twiederh at 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
> 




More information about the libvir-list mailing list