1
0
mirror of https://github.com/simh/simh.git synced 2026-05-16 02:02:15 +00:00

I1401, I7094, ID16, ID32, ND100, PDP10, SAGE, VAX780, SCP: Declaration Hygiene

simh t_bool has been declared as int.  Given this, compilers didn't
notice inconsistent declarations with other int types.  These changes
fix those problems.

I1401: Consistently declare conv_old as t_bool

I7094: Consistently declare ch6_req_wr as returning t_stat

ID16, ID32: Consistently declare idc_wds as returning t_stat

ND100: Properly declare sim_load flag argument as int

PDP10: Consistently declare build_dib_tab as returning t_stat

SAGE: Properly declare sim_load flag argument as int

VAX780: Consistently declare rtfile_read as returning t_bool

TIMER: Properly declare sim_timer_cancel as returning t_stat

CONSOLE: Properly declare sim_os_fd_isatty as returning int
This commit is contained in:
Mark Pizzolato
2026-05-13 11:19:44 -10:00
parent 242472d8b8
commit de4f01c73b
14 changed files with 23 additions and 25 deletions

View File

@@ -152,7 +152,7 @@ static t_stat sim_os_ttinit (void);
static t_stat sim_os_ttrun (void);
static t_stat sim_os_ttcmd (void);
static t_stat sim_os_ttclose (void);
static t_bool sim_os_fd_isatty (int fd);
static int sim_os_fd_isatty (int fd);
static t_stat sim_os_connect_telnet (int port);
static t_stat sim_set_rem_telnet (int32 flag, CONST char *cptr);
@@ -3311,12 +3311,12 @@ static int answer = -1;
if (answer == -1)
answer = sim_os_fd_isatty (0);
return (t_bool)answer;
return (t_bool)(answer != 0);
}
t_bool sim_fd_isatty (int fd)
{
return sim_os_fd_isatty (fd);
return (sim_os_fd_isatty (fd) != 0);
}
/* Platform specific routine definitions */
@@ -3414,7 +3414,7 @@ sys$dassgn (tty_chan);
return SCPE_OK;
}
static t_bool sim_os_fd_isatty (int fd)
static int sim_os_fd_isatty (int fd)
{
return isatty (fd);
}
@@ -3615,7 +3615,7 @@ static t_stat sim_os_ttclose (void)
return SCPE_OK;
}
static t_bool sim_os_fd_isatty (int fd)
static int sim_os_fd_isatty (int fd)
{
DWORD Mode;
HANDLE handle;
@@ -3634,7 +3634,9 @@ switch (fd) {
handle = NULL;
}
return (handle) && (handle != INVALID_HANDLE_VALUE) && GetConsoleMode (handle, &Mode);
return (((handle) &&
(handle != INVALID_HANDLE_VALUE) &&
(GetConsoleMode (handle, &Mode) != 0)) ? 1 : 0);
}
static t_stat sim_os_poll_kbd (void)
@@ -3890,7 +3892,7 @@ static t_stat sim_os_ttclose (void)
return sim_ttcmd ();
}
static t_bool sim_os_fd_isatty (int fd)
static int sim_os_fd_isatty (int fd)
{
return isatty (fd);
}
@@ -4259,7 +4261,7 @@ static t_stat sim_os_ttclose (void)
return sim_ttcmd ();
}
static t_bool sim_os_fd_isatty (int fd)
static int sim_os_fd_isatty (int fd)
{
return isatty (fd);
}