usb: Use g_new() & friends where that makes obvious sense
PATCH 1/1 usb: 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.
This commit only touches allocations with size arguments of the form sizeof(T). Same Coccinelle semantic patch as in commit b45c03f.
--- hw/usb/ccid-card-emulated.c | 4 ++-- hw/usb/dev-mtp.c | 3 +-- hw/usb/hcd-xhci.c | 2 +- hw/usb/redirect.c | 6 +++--- 4 files changed, 7 insertions(+), 8 deletions(-)
hw/usb/ccid-card-emulated.c +2 -2
@@ -166,7 +166,7 @@ static void emulated_push_event(EmulatedState *card, EmulEvent *event)static void emulated_push_type (EmulatedState *card,uint32_t type) { -EmulEvent *event = (EmulEvent *)g_malloc (sizeof (EmulEvent)); +EmulEvent *event =g_new (EmulEvent,1 );assert (event); event->p.gen.type = type;
@@ -175,7 +175,7 @@ static void emulated_push_type(EmulatedState *card, uint32_t type)static void emulated_push_error (EmulatedState *card,uint64_t code) { -EmulEvent *event = (EmulEvent *)g_malloc (sizeof (EmulEvent)); +EmulEvent *event =g_new (EmulEvent,1 );assert (event); event->p.error.type =EMUL_ERROR ;
hw/usb/dev-mtp.c +1 -2
@@ -359,8 +359,7 @@ static void usb_mtp_object_readdir(MTPState *s, MTPObject *o) }while ((entry =readdir (dir)) !=NULL ) {if ((o->nchildren %32 ) ==0 ) { - o->children =g_realloc (o->children, - (o->nchildren +32 ) *sizeof (MTPObject *)); + o->children = g_renew(MTPObject *, o->children, o->nchildren + 32); } o->children[o->nchildren] =usb_mtp_object_alloc (s, s->next_handle++, o, entry->d_name);
hw/usb/hcd-xhci.c +1 -1
@@ -2188,7 +2188,7 @@ static void xhci_kick_ep(XHCIState *xhci, unsigned int slotid, xfer->trbs =NULL ; }if (!xfer->trbs) { - xfer->trbs =g_malloc (sizeof (XHCITRB ) * length); + xfer->trbs =g_new (XHCITRB , length); xfer->trb_alloced = length; } xfer->trb_count = length;
hw/usb/redirect.c +3 -3
@@ -322,7 +322,7 @@ static void packet_id_queue_add(struct PacketIdQueue *q, uint64_t id)DPRINTF ("adding packet id %" PRIu64" to %s queue\n" , id, q->name); - e =g_malloc0 (sizeof (struct PacketIdQueueEntry )); + e = g_new0(struct PacketIdQueueEntry, 1); e->id = id;QTAILQ_INSERT_TAIL (&q->head, e, next); q->size++;
@@ -468,7 +468,7 @@ static void bufp_alloc(USBRedirDevice *dev, uint8_t *data, uint16_t len, dev->endpoint[EP2I (ep)].bufpq_dropping_packets =0 ; } - bufp =g_malloc (sizeof (struct buf_packet )); + bufp = g_new(struct buf_packet, 1); bufp->data = data; bufp->len = len; bufp->offset =0 ;
@@ -2234,7 +2234,7 @@ static int usbredir_get_bufpq(QEMUFile *f, void *priv, size_t unused) endp->bufpq_size =qemu_get_be32 (f);for (i =0 ; i < endp->bufpq_size; i++) { - bufp =g_malloc (sizeof (struct buf_packet )); + bufp = g_new(struct buf_packet, 1); bufp->len =qemu_get_be32 (f); bufp->status =qemu_get_be32 (f); bufp->offset =0 ;
Signature · 1 line
2.4.3
Quoted 8 lines · Markus Armbruster
g_new(T, n)is neater thang_malloc(sizeof(T) * n). It's also safer, for two reasons. One, it catches multiplication overflowingsize_t. Two, it returns T * rather than void *, which lets the compiler catch more type errors.This commit only touches allocations with size arguments of the form sizeof(T). Same Coccinelle semantic patch as in commit b45c03f.
Quoted 8 lines
Signed-off-by Markus Armbruster <[email protected]>--- hw/usb/ccid-card-emulated.c | 4 ++-- hw/usb/dev-mtp.c | 3 +-- hw/usb/hcd-xhci.c | 2 +- hw/usb/redirect.c | 6 +++--- 4 files changed, 7 insertions(+), 8 deletions(-)
Signature · 2 lines
Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org