[PATCH 10/19] virJSONValueNewArray: Use g_new0 to allocate and remove NULL checks from callers

Ján Tomko jtomko at redhat.com
Mon Feb 3 12:37:06 UTC 2020


On Fri, Jan 31, 2020 at 03:31:14PM +0100, Peter Krempa wrote:
>Use the glib allocation function that never returns NULL and remove the
>now dead-code checks from all callers.
>
>Signed-off-by: Peter Krempa <pkrempa at redhat.com>
>---
> src/locking/lock_daemon.c        |  4 ++--
> src/logging/log_handler.c        |  3 +--
> src/network/leaseshelper.c       |  6 +-----
> src/qemu/qemu_agent.c            |  6 +-----
> src/qemu/qemu_backup.c           |  6 ++----
> src/qemu/qemu_block.c            |  9 +++------
> src/qemu/qemu_blockjob.c         |  3 +--
> src/qemu/qemu_checkpoint.c       |  9 +++------
> src/qemu/qemu_driver.c           |  3 +--
> src/qemu/qemu_firmware.c         | 12 ++++--------
> src/qemu/qemu_migration_params.c |  3 +--
> src/qemu/qemu_monitor_json.c     |  3 +--
> src/rpc/virnetserver.c           |  6 ++----
> src/rpc/virnetserverservice.c    |  3 +--
> src/util/virjson.c               | 13 ++-----------
> src/util/virlockspace.c          |  6 ++----
> src/util/virmacmap.c             |  8 ++++----
> tests/qemublocktest.c            |  3 +--
> tests/qemumonitorjsontest.c      |  5 ++---
> 19 files changed, 35 insertions(+), 76 deletions(-)
>

>diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c
>index 4374235d34..7d01d21a11 100644
>--- a/src/qemu/qemu_agent.c
>+++ b/src/qemu/qemu_agent.c
>@@ -1201,9 +1201,6 @@ qemuAgentMakeStringsArray(const char **strings, unsigned int len)
>     size_t i;
>     virJSONValuePtr ret = virJSONValueNewArray(), str;

Beautiful.

>
>-    if (!ret)
>-        return NULL;
>-
>     for (i = 0; i < len; i++) {
>         str = virJSONValueNewString(strings[i]);
>         if (!str)

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/20200203/eb752839/attachment-0001.sig>


More information about the libvir-list mailing list