Commit fedf0d35 authored by Markus Armbruster's avatar Markus Armbruster Committed by Michael Tokarev
Browse files

ui: 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 b45c03f5.

Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Signed-off-by: default avatarMichael Tokarev <mjt@tls.msk.ru>
parent 374ec066

ui/console.c

+1 −1
Original line number Diff line number Diff line
@@ -450,7 +450,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
Original line number Diff line number Diff line
@@ -431,7 +431,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
Original line number Diff line number Diff line
@@ -206,7 +206,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;
@@ -240,7 +240,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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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);