SCP: Change declaration of get_yn() to have boolean argument and return value

- Fix improper get_yn() use in test library logic

Reported by Peter Schorn
This commit is contained in:
Mark Pizzolato 2023-04-06 12:29:25 -10:00
parent c654c20c49
commit 374e3b8e71
2 changed files with 3 additions and 3 deletions

4
scp.c
View file

@ -10429,7 +10429,7 @@ return (CONST char *)get_glyph_gen (iptr, optr, 0, TRUE, FALSE, 0);
result = true if yes, false if no result = true if yes, false if no
*/ */
t_stat get_yn (const char *ques, t_stat deflt) t_bool get_yn (const char *ques, t_bool deflt)
{ {
char cbuf[CBUFSIZE]; char cbuf[CBUFSIZE];
const char *cptr; const char *cptr;
@ -16515,7 +16515,7 @@ for (i = 0; (dptr = sim_devices[i]) != NULL; i++) {
stat = tstat; stat = tstat;
sim_printf ("%s device tests returned: %d - %s\n", dptr->name, SCPE_BARE_STATUS (tstat), sim_error_text (tstat)); sim_printf ("%s device tests returned: %d - %s\n", dptr->name, SCPE_BARE_STATUS (tstat), sim_error_text (tstat));
if (sim_ttisatty()) { if (sim_ttisatty()) {
if (get_yn ("Continue with additional tests? [N] ", SCPE_STOP) == SCPE_STOP) if (get_yn ("Continue with additional tests? [N] ", FALSE) == FALSE)
break; break;
} }
else else

2
scp.h
View file

@ -163,7 +163,7 @@ t_stat show_writelock (FILE *st, UNIT *uptr, int32 val, CONST void *desc);
const char *sim_dname (DEVICE *dptr); const char *sim_dname (DEVICE *dptr);
const char *sim_uname (UNIT *dptr); const char *sim_uname (UNIT *dptr);
const char *sim_set_uname (UNIT *uptr, const char *uname); const char *sim_set_uname (UNIT *uptr, const char *uname);
t_stat get_yn (const char *ques, t_stat deflt); t_bool get_yn (const char *ques, t_bool deflt);
void sim_srand (unsigned int seed); void sim_srand (unsigned int seed);
int sim_rand (void); int sim_rand (void);
#ifdef RAND_MAX #ifdef RAND_MAX