folkert/simh-testsetgenerator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove compiler warnings generated by newer clang compiler

Browse source
This commit is contained in:
Mark Pizzolato 2013-03-13 16:38:30 -07:00
parent 147ca8ced2
commit 3dea6056e6
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
sim_disk.c
View file

@ -910,11 +910,12 @@ if (sim_switches & SWMASK ('C')) { /* create vhd disk & cop
uptr->flags = saved_unit_flags; uptr->flags = saved_unit_flags;
} }
} }
if (!sim_quiet) if (!sim_quiet) {
if (r == SCPE_OK) if (r == SCPE_OK)
printf ("\n%s%d: Copied %dMB. Done.\n", sim_dname (dptr), (int)(uptr-dptr->units), (int)(((t_addr)lba*sector_size)/1000000)); printf ("\n%s%d: Copied %dMB. Done.\n", sim_dname (dptr), (int)(uptr-dptr->units), (int)(((t_addr)lba*sector_size)/1000000));
else else
printf ("\n%s%d: Error copying: %s.\n", sim_dname (dptr), (int)(uptr-dptr->units), sim_error_text (r)); printf ("\n%s%d: Error copying: %s.\n", sim_dname (dptr), (int)(uptr-dptr->units), sim_error_text (r));
}
free (copy_buf); free (copy_buf);
sim_vhd_disk_close (vhd); sim_vhd_disk_close (vhd);
sim_disk_detach (uptr); sim_disk_detach (uptr);

6
sim_timer.c
View file

@ -523,8 +523,9 @@ else
timedout = TRUE; timedout = TRUE;
sim_idle_wait = FALSE; sim_idle_wait = FALSE;
pthread_mutex_unlock (&sim_asynch_lock); pthread_mutex_unlock (&sim_asynch_lock);
if (!timedout) if (!timedout) {
AIO_UPDATE_QUEUE; AIO_UPDATE_QUEUE;
}
return sim_os_msec() - start_time; return sim_os_msec() - start_time;
} }
#define SIM_IDLE_MS_SLEEP sim_idle_ms_sleep #define SIM_IDLE_MS_SLEEP sim_idle_ms_sleep
@ -637,8 +638,9 @@ if (sim_asynch_enabled && sim_asynch_timer)
new_currd = rtc_currd[tmr]/10; new_currd = rtc_currd[tmr]/10;
rtc_currd[tmr] = new_currd; rtc_currd[tmr] = new_currd;
rtc_gtime[tmr] = new_gtime; /* save instruction time */ rtc_gtime[tmr] = new_gtime; /* save instruction time */
if (rtc_currd[tmr] == 127) if (rtc_currd[tmr] == 127) {
sim_debug (DBG_CAL, &sim_timer_dev, "asynch calibration small: %d\n", rtc_currd[tmr]); sim_debug (DBG_CAL, &sim_timer_dev, "asynch calibration small: %d\n", rtc_currd[tmr]);
}
sim_debug (DBG_CAL, &sim_timer_dev, "asynch calibration result: %d\n", rtc_currd[tmr]); sim_debug (DBG_CAL, &sim_timer_dev, "asynch calibration result: %d\n", rtc_currd[tmr]);
return rtc_currd[tmr]; /* calibrated result */ return rtc_currd[tmr]; /* calibrated result */
} }