瀏覽代碼

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 b45c03f.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
Markus Armbruster 9 年之前
父節點
當前提交
fedf0d35aa
共有 7 個文件被更改,包括 11 次插入11 次删除
  1. 1 1
      ui/console.c
  2. 1 1
      ui/curses.c
  3. 2 2
      ui/input-legacy.c
  4. 1 1
      ui/keymaps.c
  5. 1 1
      ui/sdl.c
  6. 3 3
      ui/vnc-jobs.c
  7. 2 2
      ui/vnc.c

+ 1 - 1
ui/console.c

@@ -450,7 +450,7 @@ static void text_console_resize(QemuConsole *s)
     if (s->width < w1)
     if (s->width < w1)
         w1 = s->width;
         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++) {
     for(y = 0; y < s->total_height; y++) {
         c = &cells[y * s->width];
         c = &cells[y * s->width];
         if (w1 > 0) {
         if (w1 > 0) {

+ 1 - 1
ui/curses.c

@@ -431,7 +431,7 @@ void curses_display_init(DisplayState *ds, int full_screen)
 
 
     curses_winch_init();
     curses_winch_init();
 
 
-    dcl = (DisplayChangeListener *) g_malloc0(sizeof(DisplayChangeListener));
+    dcl = g_new0(DisplayChangeListener, 1);
     dcl->ops = &dcl_ops;
     dcl->ops = &dcl_ops;
     register_displaychangelistener(dcl);
     register_displaychangelistener(dcl);
 
 

+ 2 - 2
ui/input-legacy.c

@@ -206,7 +206,7 @@ QEMUPutMouseEntry *qemu_add_mouse_event_handler(QEMUPutMouseEvent *func,
 {
 {
     QEMUPutMouseEntry *s;
     QEMUPutMouseEntry *s;
 
 
-    s = g_malloc0(sizeof(QEMUPutMouseEntry));
+    s = g_new0(QEMUPutMouseEntry, 1);
 
 
     s->qemu_put_mouse_event = func;
     s->qemu_put_mouse_event = func;
     s->qemu_put_mouse_event_opaque = opaque;
     s->qemu_put_mouse_event_opaque = opaque;
@@ -240,7 +240,7 @@ QEMUPutLEDEntry *qemu_add_led_event_handler(QEMUPutLEDEvent *func,
 {
 {
     QEMUPutLEDEntry *s;
     QEMUPutLEDEntry *s;
 
 
-    s = g_malloc0(sizeof(QEMUPutLEDEntry));
+    s = g_new0(QEMUPutLEDEntry, 1);
 
 
     s->put_led = func;
     s->put_led = func;
     s->opaque = opaque;
     s->opaque = opaque;

+ 1 - 1
ui/keymaps.c

@@ -109,7 +109,7 @@ static kbd_layout_t *parse_keyboard_layout(const name2keysym_t *table,
     }
     }
 
 
     if (!k) {
     if (!k) {
-        k = g_malloc0(sizeof(kbd_layout_t));
+        k = g_new0(kbd_layout_t, 1);
     }
     }
 
 
     for(;;) {
     for(;;) {

+ 1 - 1
ui/sdl.c

@@ -985,7 +985,7 @@ void sdl_display_init(DisplayState *ds, int full_screen, int no_frame)
         sdl_grab_start();
         sdl_grab_start();
     }
     }
 
 
-    dcl = g_malloc0(sizeof(DisplayChangeListener));
+    dcl = g_new0(DisplayChangeListener, 1);
     dcl->ops = &dcl_ops;
     dcl->ops = &dcl_ops;
     register_displaychangelistener(dcl);
     register_displaychangelistener(dcl);
 
 

+ 3 - 3
ui/vnc-jobs.c

@@ -79,7 +79,7 @@ static void vnc_unlock_queue(VncJobQueue *queue)
 
 
 VncJob *vnc_job_new(VncState *vs)
 VncJob *vnc_job_new(VncState *vs)
 {
 {
-    VncJob *job = g_malloc0(sizeof(VncJob));
+    VncJob *job = g_new0(VncJob, 1);
 
 
     job->vs = vs;
     job->vs = vs;
     vnc_lock_queue(queue);
     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)
 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.x = x;
     entry->rect.y = y;
     entry->rect.y = y;
@@ -298,7 +298,7 @@ disconnected:
 
 
 static VncJobQueue *vnc_queue_init(void)
 static VncJobQueue *vnc_queue_init(void)
 {
 {
-    VncJobQueue *queue = g_malloc0(sizeof(VncJobQueue));
+    VncJobQueue *queue = g_new0(VncJobQueue, 1);
 
 
     qemu_cond_init(&queue->cond);
     qemu_cond_init(&queue->cond);
     qemu_mutex_init(&queue->mutex);
     qemu_mutex_init(&queue->mutex);

+ 2 - 2
ui/vnc.c

@@ -2982,7 +2982,7 @@ static void vnc_refresh(DisplayChangeListener *dcl)
 static void vnc_connect(VncDisplay *vd, int csock,
 static void vnc_connect(VncDisplay *vd, int csock,
                         bool skipauth, bool websocket)
                         bool skipauth, bool websocket)
 {
 {
-    VncState *vs = g_malloc0(sizeof(VncState));
+    VncState *vs = g_new0(VncState, 1);
     int i;
     int i;
 
 
     vs->csock = csock;
     vs->csock = csock;
@@ -3005,7 +3005,7 @@ static void vnc_connect(VncDisplay *vd, int csock,
 
 
     vs->lossy_rect = g_malloc0(VNC_STAT_ROWS * sizeof (*vs->lossy_rect));
     vs->lossy_rect = g_malloc0(VNC_STAT_ROWS * sizeof (*vs->lossy_rect));
     for (i = 0; i < VNC_STAT_ROWS; ++i) {
     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);
     VNC_DEBUG("New client on socket %d\n", csock);