From d964df4eeae953ecc0a78e724ab628830e163f7b Mon Sep 17 00:00:00 2001 From: Mark Pizzolato Date: Thu, 9 May 2013 14:02:48 -0700 Subject: [PATCH] Compiler suggested cleanups --- PDP11/pdp11_cr.c | 2 +- PDP11/pdp11_rc.c | 2 +- PDP11/pdp11_vh.c | 2 +- S3/s3_cpu.c | 2 +- sim_serial.c | 24 ++++++++++++------------ 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/PDP11/pdp11_cr.c b/PDP11/pdp11_cr.c index 467b03f7..28e6c1bf 100644 --- a/PDP11/pdp11_cr.c +++ b/PDP11/pdp11_cr.c @@ -1372,7 +1372,7 @@ t_stat cr_show_trans ( FILE *st, return (SCPE_OK); } -t_stat cr_help (FILE *st, DEVICE *dptr, UNIT *uptr, int32 flag, char *cptr) +static t_stat cr_help (FILE *st, DEVICE *dptr, UNIT *uptr, int32 flag, char *cptr) { #if defined(VM_PDP11) char *devtype = "CR11/CD11"; diff --git a/PDP11/pdp11_rc.c b/PDP11/pdp11_rc.c index dd77b426..c1103334 100644 --- a/PDP11/pdp11_rc.c +++ b/PDP11/pdp11_rc.c @@ -591,7 +591,7 @@ static t_stat rc_set_size (UNIT *uptr, int32 val, char *cptr, void *desc) return (SCPE_OK); } -char *rc_description (DEVICE *dptr) +static char *rc_description (DEVICE *dptr) { return "RC11/RS64 fixed head disk controller"; } diff --git a/PDP11/pdp11_vh.c b/PDP11/pdp11_vh.c index b2172987..5ddb9b5e 100644 --- a/PDP11/pdp11_vh.c +++ b/PDP11/pdp11_vh.c @@ -1386,7 +1386,7 @@ static t_stat vh_detach ( UNIT *uptr ) return (tmxr_detach (&vh_desc, uptr)); } -t_stat vh_show_vec (FILE *st, UNIT *uptr, int32 arg, void *desc) +static t_stat vh_show_vec (FILE *st, UNIT *uptr, int32 arg, void *desc) { TMXR *mp = (TMXR *) desc; diff --git a/S3/s3_cpu.c b/S3/s3_cpu.c index 6906b7e2..7d3c8a52 100644 --- a/S3/s3_cpu.c +++ b/S3/s3_cpu.c @@ -1315,7 +1315,7 @@ int32 PutMem(int32 addr, int32 data) /* Check the condition register against the qbyte and return 1 if true */ -int32 condition(int32 qbyte) +static int32 condition(int32 qbyte) { int32 r = 0, t, q; t = (qbyte & 0xf0) >> 4; diff --git a/sim_serial.c b/sim_serial.c index 14678e95..15dee496 100644 --- a/sim_serial.c +++ b/sim_serial.c @@ -583,7 +583,7 @@ return ports; interest to a DCB retrieved from a call to "GetCommState". */ -SERHANDLE sim_open_os_serial (char *name) +static SERHANDLE sim_open_os_serial (char *name) { SERHANDLE port; DCB dcb; @@ -675,7 +675,7 @@ return port; /* return port handle on 1.5 stop bits. */ -t_stat sim_config_os_serial (SERHANDLE port, SERCONFIG config) +static t_stat sim_config_os_serial (SERHANDLE port, SERCONFIG config) { static const struct { char parity; @@ -868,7 +868,7 @@ else The serial port is closed. Errors are ignored. */ -void sim_close_os_serial (SERHANDLE port) +static void sim_close_os_serial (SERHANDLE port) { CloseHandle (port); /* close the port */ return; @@ -1000,7 +1000,7 @@ return ports; reading. */ -SERHANDLE sim_open_os_serial (char *name) +static SERHANDLE sim_open_os_serial (char *name) { static const tcflag_t i_clear = IGNBRK | /* ignore BREAK */ BRKINT | /* signal on BREAK */ @@ -1118,7 +1118,7 @@ return port; /* return port fd for su */ -t_stat sim_config_os_serial (SERHANDLE port, SERCONFIG config) +static t_stat sim_config_os_serial (SERHANDLE port, SERCONFIG config) { struct termios tio; int32 i; @@ -1339,7 +1339,7 @@ return (int32) written; /* return number of The serial port is closed. Errors are ignored. */ -void sim_close_os_serial (SERHANDLE port) +static void sim_close_os_serial (SERHANDLE port) { close (port); /* close the port */ return; @@ -1484,7 +1484,7 @@ return ports; */ -SERHANDLE sim_open_os_serial (char *name) +static SERHANDLE sim_open_os_serial (char *name) { uint32 status; uint32 chan = 0; @@ -1541,7 +1541,7 @@ return chan; /* return channel for su */ -t_stat sim_config_os_serial (SERHANDLE port, SERCONFIG config) +static t_stat sim_config_os_serial (SERHANDLE port, SERCONFIG config) { int32 i; SENSE_BUF sense; @@ -1780,7 +1780,7 @@ return (int32)iosb.count; /* return number of char The serial port is closed. Errors are ignored. */ -void sim_close_os_serial (SERHANDLE port) +static void sim_close_os_serial (SERHANDLE port) { sys$dassgn (port); /* close the port */ return; @@ -1800,7 +1800,7 @@ return 0; /* Open a serial port */ -SERHANDLE sim_open_os_serial (char *name) +static SERHANDLE sim_open_os_serial (char *name) { return INVALID_HANDLE; } @@ -1808,7 +1808,7 @@ return INVALID_HANDLE; /* Configure a serial port */ -t_stat sim_config_os_serial (SERHANDLE port, SERCONFIG config) +static t_stat sim_config_os_serial (SERHANDLE port, SERCONFIG config) { return SCPE_IERR; } @@ -1840,7 +1840,7 @@ return -1; /* Close a serial port */ -void sim_close_os_serial (SERHANDLE port) +static void sim_close_os_serial (SERHANDLE port) { return; }