malloc to calloc
This commit is contained in:
@@ -2313,8 +2313,7 @@ machine_xt_m24_init(const machine_t *model)
|
||||
if (bios_only || !ret)
|
||||
return ret;
|
||||
|
||||
m24_kbd = (m24_kbd_t *) malloc(sizeof(m24_kbd_t));
|
||||
memset(m24_kbd, 0x00, sizeof(m24_kbd_t));
|
||||
m24_kbd = (m24_kbd_t *) calloc(1, sizeof(m24_kbd_t));
|
||||
|
||||
machine_common_init(model);
|
||||
|
||||
@@ -2330,10 +2329,9 @@ machine_xt_m24_init(const machine_t *model)
|
||||
nmi_init();
|
||||
|
||||
/* Allocate an NVR for this machine. */
|
||||
nvr = (nvr_t *) malloc(sizeof(nvr_t));
|
||||
nvr = (nvr_t *) calloc(1, sizeof(nvr_t));
|
||||
if (nvr == NULL)
|
||||
return 0;
|
||||
memset(nvr, 0x00, sizeof(nvr_t));
|
||||
|
||||
mm58174_init(nvr, model->nvrmask + 1);
|
||||
|
||||
@@ -2374,8 +2372,7 @@ machine_xt_m240_init(const machine_t *model)
|
||||
if (bios_only || !ret)
|
||||
return ret;
|
||||
|
||||
m24_kbd = (m24_kbd_t *) malloc(sizeof(m24_kbd_t));
|
||||
memset(m24_kbd, 0x00, sizeof(m24_kbd_t));
|
||||
m24_kbd = (m24_kbd_t *) calloc(1, sizeof(m24_kbd_t));
|
||||
|
||||
machine_common_init(model);
|
||||
|
||||
@@ -2404,10 +2401,9 @@ machine_xt_m240_init(const machine_t *model)
|
||||
nmi_init();
|
||||
|
||||
/* Allocate an NVR for this machine. */
|
||||
nvr = (nvr_t *) malloc(sizeof(nvr_t));
|
||||
nvr = (nvr_t *) calloc(1, sizeof(nvr_t));
|
||||
if (nvr == NULL)
|
||||
return 0;
|
||||
memset(nvr, 0x00, sizeof(nvr_t));
|
||||
|
||||
mm58274_init(nvr, model->nvrmask + 1);
|
||||
|
||||
@@ -2438,8 +2434,7 @@ machine_xt_m19_init(const machine_t *model)
|
||||
m19_vid_t *vid;
|
||||
|
||||
/* Do not move memory allocation elsewhere. */
|
||||
vid = (m19_vid_t *) malloc(sizeof(m19_vid_t));
|
||||
memset(vid, 0x00, sizeof(m19_vid_t));
|
||||
vid = (m19_vid_t *) calloc(1, sizeof(m19_vid_t));
|
||||
|
||||
machine_common_init(model);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user