From 8d09ebec8b0f66a680a5d1c934e5016b07ef8e5b Mon Sep 17 00:00:00 2001 From: Mark Pizzolato Date: Wed, 5 Feb 2014 13:44:36 -0800 Subject: [PATCH] Compiler indicated cleanups to Fix #105 --- I1401/i1401_sys.c | 1 - scp.c | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/I1401/i1401_sys.c b/I1401/i1401_sys.c index 94976277..81e5d2b1 100644 --- a/I1401/i1401_sys.c +++ b/I1401/i1401_sys.c @@ -51,7 +51,6 @@ extern REG cpu_reg[]; extern uint8 M[]; extern char ascii_to_bcd_old[128], ascii_to_bcd[128]; extern char bcd_to_ascii_old[64], bcd_to_ascii_a[64], bcd_to_ascii_h[64]; -extern char *get_glyph (char *cptr, char *gbuf, char term); extern int32 store_addr_h (int32 addr); extern int32 store_addr_t (int32 addr); extern int32 store_addr_u (int32 addr); diff --git a/scp.c b/scp.c index e254c661..12fff765 100644 --- a/scp.c +++ b/scp.c @@ -8195,7 +8195,7 @@ static TOPIC *buildHelp (TOPIC *topic, struct sim_device *dptr, htext++; continue; } - FAIL (SCPE_ARG, Unknown line type, NULL); /* Unknown line */ + FAIL (SCPE_ARG, Unknown line type, htext); /* Unknown line */ } /* htext not at end */ memset (vstrings, 0, VSMAX * sizeof (char *)); vsnum = 0; @@ -8402,11 +8402,11 @@ t_stat scp_vhelp (FILE *st, struct sim_device *dptr, if ((failed = setjmp (help_env)) != 0) { fprintf (stderr, "\nHelp was unable to process the help for this device.\n" "Error in block %u line %u: %s\n" - "%s%0.*s%s" + "%s%*.*s%s" " Please contact the device maintainer.\n", (int)help_where.block, (int)help_where.line, help_where.error, help_where.prox ? "Near '" : "", - help_where.prox ? 15 : 0, + help_where.prox ? 15 : 0, help_where.prox ? 15 : 0, help_where.prox ? help_where.prox : "", help_where.prox ? "'" : ""); cleanHelp (&top);