audio: Use g_new() & friends where that makes obvious sense WIP
PATCH 1/1 audio: Use g_new() & friends where that makes obvious sense WIP
TODO credit coccinelle
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).
--- audio/alsaaudio.c | 2 +- audio/coreaudio.c | 2 +- audio/dsoundaudio.c | 2 +- audio/ossaudio.c | 2 +- audio/paaudio.c | 2 +- audio/wavaudio.c | 2 +- hw/audio/intel-hda.c | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-)
audio/alsaaudio.c +1 -1
@@ -1125,7 +1125,7 @@ static ALSAConf glob_conf = {static void *alsa_audio_init (void ) { -ALSAConf *conf =g_malloc (sizeof (ALSAConf)); +ALSAConf *conf =g_new (ALSAConf,1 ); *conf = glob_conf;return conf; }
audio/coreaudio.c +1 -1
@@ -504,7 +504,7 @@ static CoreaudioConf glob_conf = {static void *coreaudio_audio_init (void ) { -CoreaudioConf *conf =g_malloc (sizeof (CoreaudioConf)); +CoreaudioConf *conf =g_new (CoreaudioConf,1 ); *conf = glob_conf;atexit (coreaudio_atexit);
audio/dsoundaudio.c +1 -1
@@ -786,7 +786,7 @@ static void *dsound_audio_init (void) {int err;HRESULT hr; -dsound *s =g_malloc0 (sizeof (dsound)); +dsound *s =g_new0 (dsound,1 ); s->conf = glob_conf; hr =CoInitialize (NULL );
audio/ossaudio.c +1 -1
@@ -848,7 +848,7 @@ static OSSConf glob_conf = {static void *oss_audio_init (void ) { -OSSConf *conf =g_malloc (sizeof (OSSConf)); +OSSConf *conf =g_new (OSSConf,1 ); *conf = glob_conf; if (access(conf->devpath_in, R_OK | W_OK) < 0 ||
audio/paaudio.c +1 -1
@@ -814,7 +814,7 @@ static PAConf glob_conf = {static void *qpa_audio_init (void ) { -paaudio *g =g_malloc (sizeof (paaudio)); +paaudio *g =g_new (paaudio,1 ); g->conf = glob_conf; g->mainloop =NULL ; g->context =NULL ;
audio/wavaudio.c +1 -1
@@ -230,7 +230,7 @@ static WAVConf glob_conf = {static void *wav_audio_init (void ) { -WAVConf *conf =g_malloc (sizeof (WAVConf)); +WAVConf *conf =g_new (WAVConf,1 ); *conf = glob_conf;return conf; }
hw/audio/intel-hda.c +1 -1
@@ -467,7 +467,7 @@ static void intel_hda_parse_bdl(IntelHDAState *d, IntelHDAStream *st) addr =intel_hda_addr (st->bdlp_lbase, st->bdlp_ubase); st->bentries = st->lvi +1 ;g_free (st->bpl); - st->bpl =g_malloc (sizeof (bpl) * st->bentries); + st->bpl =g_new (bpl, st->bentries);for (i =0 ; i < st->bentries; i++, addr +=16 ) {pci_dma_read (&d->pci, addr, buf,16 ); st->bpl[i].addr =le64_to_cpu (*(uint64_t *)buf);
Signature · 1 line
2.4.3
PATCH 1/1 qxl: Use g_new() & friends where that makes obvious sense WIP
TODO credit coccinelle
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).
--- hw/display/qxl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
hw/display/qxl.c +1 -1
@@ -2156,7 +2156,7 @@ static int qxl_post_load(void *opaque, int version)qxl_create_guest_primary (d,1 ,QXL_SYNC );/* replay surface-create and cursor-set commands */ - cmds =g_malloc0 (sizeof (QXLCommandExt) * (d->ssd.num_surfaces +1 )); + cmds =g_new0 (QXLCommandExt, d->ssd.num_surfaces +1 );for (in =0 , out =0 ; in < d->ssd.num_surfaces; in++) {if (d->guest_surfaces.cmds[in] ==0 ) {continue ;
Signature · 1 line
2.4.3
PATCH 1/1 ui: Use g_new() & friends where that makes obvious sense WIP
In reply to Markus ArmbrusterTODO credit coccinelle
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).
--- ui/console.c | 2 +- ui/curses.c | 2 +- ui/input-legacy.c | 4 ++-- ui/keymaps.c | 2 +- ui/sdl.c | 2 +- ui/vnc-jobs.c | 6 +++--- ui/vnc.c | 6 +++--- 7 files changed, 12 insertions(+), 12 deletions(-)
ui/console.c +1 -1
@@ -449,7 +449,7 @@ static void text_console_resize(QemuConsole *s)if (s->width < w1) w1 = s->width; - cells =g_malloc (s->width * s->total_height *sizeof (TextCell)); + cells =g_new (TextCell, s->width * s->total_height);for (y =0 ; y < s->total_height; y++) { c = &cells[y * s->width];if (w1 >0 ) {
ui/curses.c +1 -1
@@ -382,7 +382,7 @@ void curses_display_init(DisplayState *ds, int full_screen)curses_winch_init (); - dcl = (DisplayChangeListener *)g_malloc0 (sizeof (DisplayChangeListener)); + dcl =g_new0 (DisplayChangeListener,1 ); dcl->ops = &dcl_ops;register_displaychangelistener (dcl);
ui/input-legacy.c +2 -2
@@ -205,7 +205,7 @@ QEMUPutMouseEntry *qemu_add_mouse_event_handler(QEMUPutMouseEvent *func, {QEMUPutMouseEntry *s; - s =g_malloc0 (sizeof (QEMUPutMouseEntry)); + s =g_new0 (QEMUPutMouseEntry,1 ); s->qemu_put_mouse_event = func; s->qemu_put_mouse_event_opaque = opaque;
@@ -239,7 +239,7 @@ QEMUPutLEDEntry *qemu_add_led_event_handler(QEMUPutLEDEvent *func, {QEMUPutLEDEntry *s; - s =g_malloc0 (sizeof (QEMUPutLEDEntry)); + s =g_new0 (QEMUPutLEDEntry,1 ); s->put_led = func; s->opaque = opaque;
ui/keymaps.c +1 -1
@@ -109,7 +109,7 @@ static kbd_layout_t *parse_keyboard_layout(const name2keysym_t *table, }if (!k) { - k =g_malloc0 (sizeof (kbd_layout_t)); + k =g_new0 (kbd_layout_t,1 ); }for (;;) {
ui/sdl.c +1 -1
@@ -985,7 +985,7 @@ void sdl_display_init(DisplayState *ds, int full_screen, int no_frame)sdl_grab_start (); } - dcl =g_malloc0 (sizeof (DisplayChangeListener)); + dcl =g_new0 (DisplayChangeListener,1 ); dcl->ops = &dcl_ops;register_displaychangelistener (dcl);
ui/vnc-jobs.c +3 -3
@@ -79,7 +79,7 @@ static void vnc_unlock_queue(VncJobQueue *queue)VncJob *vnc_job_new (VncState *vs) { -VncJob *job =g_malloc0 (sizeof (VncJob)); +VncJob *job =g_new0 (VncJob,1 ); job->vs = vs;vnc_lock_queue (queue);
@@ -90,7 +90,7 @@ VncJob *vnc_job_new(VncState *vs)int vnc_job_add_rect (VncJob *job,int x,int y,int w,int h) { -VncRectEntry *entry =g_malloc0 (sizeof (VncRectEntry)); +VncRectEntry *entry =g_new0 (VncRectEntry,1 ); entry->rect.x = x; entry->rect.y = y;
@@ -298,7 +298,7 @@ disconnected:static VncJobQueue *vnc_queue_init (void ) { -VncJobQueue *queue =g_malloc0 (sizeof (VncJobQueue)); +VncJobQueue *queue =g_new0 (VncJobQueue,1 );qemu_cond_init (&queue->cond);qemu_mutex_init (&queue->mutex);
ui/vnc.c +3 -3
@@ -170,7 +170,7 @@ static VncBasicInfo *vnc_basic_info_get(struct sockaddr_storage *sa,return NULL ; } - info =g_malloc0 (sizeof (VncBasicInfo)); + info =g_new0 (VncBasicInfo,1 ); info->host =g_strdup (host); info->service =g_strdup (serv); info->family =inet_netfamily (sa->ss_family);
@@ -3002,7 +3002,7 @@ static void vnc_refresh(DisplayChangeListener *dcl)static void vnc_connect (VncDisplay *vd,int csock,bool skipauth,bool websocket) { -VncState *vs =g_malloc0 (sizeof (VncState)); +VncState *vs =g_new0 (VncState,1 );int i; vs->csock = csock;
@@ -3025,7 +3025,7 @@ static void vnc_connect(VncDisplay *vd, int csock, vs->lossy_rect =g_malloc0 (VNC_STAT_ROWS *sizeof (*vs->lossy_rect));for (i =0 ; i <VNC_STAT_ROWS ; ++i) { - vs->lossy_rect[i] =g_malloc0 (VNC_STAT_COLS *sizeof (uint8_t )); + vs->lossy_rect[i] =g_new0 (uint8_t,VNC_STAT_COLS ); }VNC_DEBUG ("New client on socket %d\n" , csock);
Signature · 1 line
2.4.3
PATCH 1/1 usb: Use g_new() & friends where that makes obvious sense WIP
In reply to Markus ArmbrusterTODO credit coccinelle
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).
--- 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
Sent out the patches with unfinished commit messages by mistake, please ignore.