]> git.proxmox.com Git - mirror_qemu.git/commit - block.c
block: Use g_new() & friends where that makes obvious sense
authorMarkus Armbruster <armbru@redhat.com>
Tue, 19 Aug 2014 08:31:08 +0000 (10:31 +0200)
committerKevin Wolf <kwolf@redhat.com>
Wed, 20 Aug 2014 09:51:28 +0000 (11:51 +0200)
commit5839e53bbc0fec56021d758aab7610df421ed8c8
tree1075e29349d0b56c15c6e3b33b5dbc752d806d81
parent302fa283789a2f9b1199c327047cfad2258a23a2
block: Use g_new() & friends where that makes obvious sense

g_new(T, n) is neater than g_malloc(sizeof(T) * n).  It's also safer,
for two reasons.  One, it catches multiplication overflowing size_t.
Two, it returns T * rather than void *, which lets the compiler catch
more type errors.

Patch created with Coccinelle, with two manual changes on top:

* Add const to bdrv_iterate_format() to keep the types straight

* Convert the allocation in bdrv_drop_intermediate(), which Coccinelle
  inexplicably misses

Coccinelle semantic patch:

    @@
    type T;
    @@
    -g_malloc(sizeof(T))
    +g_new(T, 1)
    @@
    type T;
    @@
    -g_try_malloc(sizeof(T))
    +g_try_new(T, 1)
    @@
    type T;
    @@
    -g_malloc0(sizeof(T))
    +g_new0(T, 1)
    @@
    type T;
    @@
    -g_try_malloc0(sizeof(T))
    +g_try_new0(T, 1)
    @@
    type T;
    expression n;
    @@
    -g_malloc(sizeof(T) * (n))
    +g_new(T, n)
    @@
    type T;
    expression n;
    @@
    -g_try_malloc(sizeof(T) * (n))
    +g_try_new(T, n)
    @@
    type T;
    expression n;
    @@
    -g_malloc0(sizeof(T) * (n))
    +g_new0(T, n)
    @@
    type T;
    expression n;
    @@
    -g_try_malloc0(sizeof(T) * (n))
    +g_try_new0(T, n)
    @@
    type T;
    expression p, n;
    @@
    -g_realloc(p, sizeof(T) * (n))
    +g_renew(T, p, n)
    @@
    type T;
    expression p, n;
    @@
    -g_try_realloc(p, sizeof(T) * (n))
    +g_try_renew(T, p, n)

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Jeff Cody <jcody@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
22 files changed:
block-migration.c
block.c
block/archipelago.c
block/gluster.c
block/iscsi.c
block/nfs.c
block/qcow.c
block/qcow2-cluster.c
block/qcow2-refcount.c
block/qcow2-snapshot.c
block/raw-posix.c
block/rbd.c
block/sheepdog.c
block/vdi.c
block/vhdx.c
block/vmdk.c
block/vvfat.c
blockdev-nbd.c
blockdev.c
hw/ide/ahci.c
qemu-io-cmds.c
qemu-io.c