malloc to calloc

src/machine/m_amstrad.c

@@ -619,8 +619,7 @@ vid_init_1512(amstrad_t *ams)
     amsvid_t *vid;
 
     /* Allocate a video controller block. */
-    vid = (amsvid_t *) malloc(sizeof(amsvid_t));
-    memset(vid, 0x00, sizeof(amsvid_t));
+    vid = (amsvid_t *) calloc(1, sizeof(amsvid_t));
 
     video_inform(VIDEO_FLAG_TYPE_CGA, &timing_pc1512);
 
@@ -823,8 +822,7 @@ vid_init_1640(amstrad_t *ams)
     amsvid_t *vid;
 
     /* Allocate a video controller block. */
-    vid = (amsvid_t *) malloc(sizeof(amsvid_t));
-    memset(vid, 0x00, sizeof(amsvid_t));
+    vid = (amsvid_t *) calloc(1, sizeof(amsvid_t));
 
     rom_init(&vid->bios_rom, "roms/machines/pc1640/40100",
              0xc0000, 0x8000, 0x7fff, 0, 0);
@@ -1620,8 +1618,7 @@ vid_init_200(amstrad_t *ams)
     mda_t    *mda;
 
     /* Allocate a video controller block. */
-    vid = (amsvid_t *) malloc(sizeof(amsvid_t));
-    memset(vid, 0x00, sizeof(amsvid_t));
+    vid = (amsvid_t *) calloc(1, sizeof(amsvid_t));
 
     vid->emulation = device_get_config_int("video_emulation");
 
@@ -2870,8 +2867,7 @@ machine_amstrad_init(const machine_t *model, int type)
 {
     amstrad_t *ams;
 
-    ams = (amstrad_t *) malloc(sizeof(amstrad_t));
-    memset(ams, 0x00, sizeof(amstrad_t));
+    ams = (amstrad_t *) calloc(1, sizeof(amstrad_t));
     ams->type     = type;
     amstrad_latch = 0x80000000;
 

src/machine/m_at_compaq.c

@@ -629,8 +629,7 @@ compaq_plasma_recalcattrs(compaq_plasma_t *self)
 static void *
 compaq_plasma_init(UNUSED(const device_t *info))
 {
-    compaq_plasma_t *self = malloc(sizeof(compaq_plasma_t));
-    memset(self, 0, sizeof(compaq_plasma_t));
+    compaq_plasma_t *self = calloc(1, sizeof(compaq_plasma_t));
 
     video_inform(VIDEO_FLAG_TYPE_CGA, &timing_compaq_plasma);
     if (compaq_machine_type == COMPAQ_PORTABLEIII)

src/machine/m_at_t3100e_vid.c

@@ -655,8 +655,7 @@ t3100e_recalcattrs(t3100e_t *t3100e)
 void *
 t3100e_init(UNUSED(const device_t *info))
 {
-    t3100e_t *t3100e = malloc(sizeof(t3100e_t));
-    memset(t3100e, 0, sizeof(t3100e_t));
+    t3100e_t *t3100e = calloc(1, sizeof(t3100e_t));
     loadfont("roms/machines/t3100e/t3100e_font.bin", 5);
     cga_init(&t3100e->cga);
     video_inform(VIDEO_FLAG_TYPE_CGA, &timing_t3100e);

src/machine/m_pcjr.c

@@ -1532,8 +1532,7 @@ machine_pcjr_init(UNUSED(const machine_t *model))
     if (bios_only || !ret)
         return ret;
 
-    pcjr = malloc(sizeof(pcjr_t));
-    memset(pcjr, 0x00, sizeof(pcjr_t));
+    pcjr = calloc(1, sizeof(pcjr_t));
 
     pic_init_pcjr();
     pit_common_init(0, pit_irq0_timer_pcjr, NULL);

src/machine/m_ps1.c

@@ -299,8 +299,7 @@ ps1_setup(int model)
     ps1_t *ps;
     void  *priv;
 
-    ps = (ps1_t *) malloc(sizeof(ps1_t));
-    memset(ps, 0x00, sizeof(ps1_t));
+    ps = (ps1_t *) calloc(1, sizeof(ps1_t));
     ps->model = model;
 
     io_sethandler(0x0091, 1,

src/machine/m_ps1_hdc.c

@@ -1297,8 +1297,7 @@ ps1_hdc_init(UNUSED(const device_t *info))
     int      c;
 
     /* Allocate and initialize device block. */
-    dev = malloc(sizeof(hdc_t));
-    memset(dev, 0x00, sizeof(hdc_t));
+    dev = calloc(1, sizeof(hdc_t));
 
     /* Set up controller parameters for PS/1 2011. */
     dev->base = 0x0320;

src/machine/m_ps2_isa.c

@@ -151,8 +151,7 @@ ps2_isa_setup(int model, int cpu_type)
     ps2_isa_t *ps2;
     void      *priv;
 
-    ps2 = (ps2_isa_t *) malloc(sizeof(ps2_isa_t));
-    memset(ps2, 0x00, sizeof(ps2_isa_t));
+    ps2 = (ps2_isa_t *) calloc(1, sizeof(ps2_isa_t));
     ps2->model    = model;
     ps2->cpu_type = cpu_type;
 

src/machine/m_tandy.c

@@ -1359,8 +1359,7 @@ vid_init(tandy_t *dev)
     int       display_type;
     t1kvid_t *vid;
 
-    vid = malloc(sizeof(t1kvid_t));
-    memset(vid, 0x00, sizeof(t1kvid_t));
+    vid = calloc(1, sizeof(t1kvid_t));
     vid->memctrl = -1;
 
     video_inform(VIDEO_FLAG_TYPE_CGA, &timing_dram);
@@ -1540,8 +1539,7 @@ eep_init(const device_t *info)
     t1keep_t *eep;
     FILE     *fp = NULL;
 
-    eep = (t1keep_t *) malloc(sizeof(t1keep_t));
-    memset(eep, 0x00, sizeof(t1keep_t));
+    eep = (t1keep_t *) calloc(1, sizeof(t1keep_t));
 
     switch (info->local) {
         case TYPE_TANDY1000HX:

src/machine/m_xt_olivetti.c

@@ -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);
 

src/machine/m_xt_t1000_vid.c

@@ -651,8 +651,7 @@ t1000_recalcattrs(t1000_t *t1000)
 static void *
 t1000_init(UNUSED(const device_t *info))
 {
-    t1000_t *t1000 = malloc(sizeof(t1000_t));
-    memset(t1000, 0, sizeof(t1000_t));
+    t1000_t *t1000 = calloc(1, sizeof(t1000_t));
     loadfont("roms/machines/t1000/t1000font.bin", 8);
     cga_init(&t1000->cga);
     video_inform(VIDEO_FLAG_TYPE_CGA, &timing_t1000);

src/machine/m_xt_zenith.c

@@ -73,8 +73,7 @@ zenith_scratchpad_init(UNUSED(const device_t *info))
 {
     zenith_t *dev;
 
-    dev = (zenith_t *) malloc(sizeof(zenith_t));
-    memset(dev, 0x00, sizeof(zenith_t));
+    dev = (zenith_t *) calloc(1, sizeof(zenith_t));
 
     dev->scratchpad_ram = malloc(0x4000);