iSimply avoid warnings of modern gcc - enscript - GNU Enscript Err thinkerwim.openbsd.amsterdam 70 hgit clone git://thinkerwim.org/enscript.git URL:git://thinkerwim.org/enscript.git thinkerwim.org 70 1Log /git/enscript/log.gph thinkerwim.org 70 1Files /git/enscript/files.gph thinkerwim.org 70 1Refs /git/enscript/refs.gph thinkerwim.org 70 1README /git/enscript/file/README.gph thinkerwim.org 70 1LICENSE /git/enscript/file/COPYING.gph thinkerwim.org 70 i--- Err thinkerwim.openbsd.amsterdam 70 1commit 0779ca6512bf93e8f8dfe53c1a3446adb2475acc /git/enscript/commit/0779ca6512bf93e8f8dfe53c1a3446adb2475acc.gph thinkerwim.org 70 1parent 1b76685a8e405f54bae2b0f131588e8018e80f71 /git/enscript/commit/1b76685a8e405f54bae2b0f131588e8018e80f71.gph thinkerwim.org 70 hAuthor: Werner Fink URL:mailto:werner@suse.de thinkerwim.org 70 iDate: Tue, 23 Jan 2018 15:26:50 +0100 Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 iSimply avoid warnings of modern gcc Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 iSigned-off-by: Werner Fink Err thinkerwim.openbsd.amsterdam 70 iSigned-off-by: James Cloos Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 iDiffstat: Err thinkerwim.openbsd.amsterdam 70 i M afmlib/afmparse.c | 2 +- Err thinkerwim.openbsd.amsterdam 70 i M compat/regex.c | 12 ++++++------ Err thinkerwim.openbsd.amsterdam 70 i M compat/xalloc.c | 6 +++--- Err thinkerwim.openbsd.amsterdam 70 i M src/gsint.h | 2 +- Err thinkerwim.openbsd.amsterdam 70 i M src/main.c | 3 ++- Err thinkerwim.openbsd.amsterdam 70 i M src/psgen.c | 30 ++++++++++++++---------------- Err thinkerwim.openbsd.amsterdam 70 i M src/util.c | 10 ++++++---- Err thinkerwim.openbsd.amsterdam 70 i M states/main.c | 2 +- Err thinkerwim.openbsd.amsterdam 70 i M states/utils.c | 2 +- Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i9 files changed, 35 insertions(+), 34 deletions(-) Err thinkerwim.openbsd.amsterdam 70 i--- Err thinkerwim.openbsd.amsterdam 70 1diff --git a/afmlib/afmparse.c b/afmlib/afmparse.c /git/enscript/file/afmlib/afmparse.c.gph thinkerwim.org 70 i@@ -620,7 +620,7 @@ static void Err thinkerwim.openbsd.amsterdam 70 i get_key (AFMHandle handle, ParseCtx *ctx, AFMKey *key_return) Err thinkerwim.openbsd.amsterdam 70 i { Err thinkerwim.openbsd.amsterdam 70 i int key; Err thinkerwim.openbsd.amsterdam 70 i- char msg[256]; Err thinkerwim.openbsd.amsterdam 70 i+ char msg[1024+16]; Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i while (1) Err thinkerwim.openbsd.amsterdam 70 i { Err thinkerwim.openbsd.amsterdam 70 1diff --git a/compat/regex.c b/compat/regex.c /git/enscript/file/compat/regex.c.gph thinkerwim.org 70 i@@ -2400,11 +2400,12 @@ regex_compile (pattern, size, syntax, bufp) Err thinkerwim.openbsd.amsterdam 70 i case ')': Err thinkerwim.openbsd.amsterdam 70 i if (syntax & RE_NO_BK_PARENS) goto normal_backslash; Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i- if (COMPILE_STACK_EMPTY) Err thinkerwim.openbsd.amsterdam 70 i+ if (COMPILE_STACK_EMPTY) { Err thinkerwim.openbsd.amsterdam 70 i if (syntax & RE_UNMATCHED_RIGHT_PAREN_ORD) Err thinkerwim.openbsd.amsterdam 70 i goto normal_backslash; Err thinkerwim.openbsd.amsterdam 70 i else Err thinkerwim.openbsd.amsterdam 70 i FREE_STACK_RETURN (REG_ERPAREN); Err thinkerwim.openbsd.amsterdam 70 i+ } Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i handle_close: Err thinkerwim.openbsd.amsterdam 70 i if (fixup_alt_jump) Err thinkerwim.openbsd.amsterdam 70 i@@ -2420,11 +2421,12 @@ regex_compile (pattern, size, syntax, bufp) Err thinkerwim.openbsd.amsterdam 70 i } Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i /* See similar code for backslashed left paren above. */ Err thinkerwim.openbsd.amsterdam 70 i- if (COMPILE_STACK_EMPTY) Err thinkerwim.openbsd.amsterdam 70 i+ if (COMPILE_STACK_EMPTY) { Err thinkerwim.openbsd.amsterdam 70 i if (syntax & RE_UNMATCHED_RIGHT_PAREN_ORD) Err thinkerwim.openbsd.amsterdam 70 i goto normal_char; Err thinkerwim.openbsd.amsterdam 70 i else Err thinkerwim.openbsd.amsterdam 70 i FREE_STACK_RETURN (REG_ERPAREN); Err thinkerwim.openbsd.amsterdam 70 i+ } Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i /* Since we just checked for an empty stack above, this Err thinkerwim.openbsd.amsterdam 70 i ``can't happen''. */ Err thinkerwim.openbsd.amsterdam 70 i@@ -3106,8 +3108,6 @@ re_compile_fastmap (bufp) Err thinkerwim.openbsd.amsterdam 70 i char *destination; Err thinkerwim.openbsd.amsterdam 70 i #endif Err thinkerwim.openbsd.amsterdam 70 i /* We don't push any register information onto the failure stack. */ Err thinkerwim.openbsd.amsterdam 70 i- unsigned num_regs = 0; Err thinkerwim.openbsd.amsterdam 70 i- Err thinkerwim.openbsd.amsterdam 70 i register char *fastmap = bufp->fastmap; Err thinkerwim.openbsd.amsterdam 70 i unsigned char *pattern = bufp->buffer; Err thinkerwim.openbsd.amsterdam 70 i unsigned char *p = pattern; Err thinkerwim.openbsd.amsterdam 70 i@@ -4801,8 +4801,8 @@ re_match_2_internal (bufp, string1, size1, string2, size2, pos, regs, stop) Err thinkerwim.openbsd.amsterdam 70 i register from the stack, since lowest will == highest in Err thinkerwim.openbsd.amsterdam 70 i `pop_failure_point'. */ Err thinkerwim.openbsd.amsterdam 70 i active_reg_t dummy_low_reg, dummy_high_reg; Err thinkerwim.openbsd.amsterdam 70 i- unsigned char *pdummy; Err thinkerwim.openbsd.amsterdam 70 i- const char *sdummy; Err thinkerwim.openbsd.amsterdam 70 i+ unsigned char *pdummy __attribute__ ((__unused__)); Err thinkerwim.openbsd.amsterdam 70 i+ const char *sdummy __attribute__ ((__unused__)); Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i DEBUG_PRINT1 ("EXECUTING pop_failure_jump.\n"); Err thinkerwim.openbsd.amsterdam 70 i POP_FAILURE_POINT (sdummy, pdummy, Err thinkerwim.openbsd.amsterdam 70 1diff --git a/compat/xalloc.c b/compat/xalloc.c /git/enscript/file/compat/xalloc.c.gph thinkerwim.org 70 i@@ -67,7 +67,7 @@ xmalloc (size) Err thinkerwim.openbsd.amsterdam 70 i ptr = malloc (size); Err thinkerwim.openbsd.amsterdam 70 i if (ptr == NULL) Err thinkerwim.openbsd.amsterdam 70 i { Err thinkerwim.openbsd.amsterdam 70 i- fprintf (stderr, _("xmalloc(): couldn't allocate %d bytes\n"), size); Err thinkerwim.openbsd.amsterdam 70 i+ fprintf (stderr, _("xmalloc(): couldn't allocate %zd bytes\n"), size); Err thinkerwim.openbsd.amsterdam 70 i exit (1); Err thinkerwim.openbsd.amsterdam 70 i } Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i@@ -85,7 +85,7 @@ xcalloc (num, size) Err thinkerwim.openbsd.amsterdam 70 i ptr = calloc (num, size); Err thinkerwim.openbsd.amsterdam 70 i if (ptr == NULL) Err thinkerwim.openbsd.amsterdam 70 i { Err thinkerwim.openbsd.amsterdam 70 i- fprintf (stderr, _("xcalloc(): couldn't allocate %d bytes\n"), size); Err thinkerwim.openbsd.amsterdam 70 i+ fprintf (stderr, _("xcalloc(): couldn't allocate %zd bytes\n"), size); Err thinkerwim.openbsd.amsterdam 70 i exit (1); Err thinkerwim.openbsd.amsterdam 70 i } Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i@@ -106,7 +106,7 @@ xrealloc (ptr, size) Err thinkerwim.openbsd.amsterdam 70 i nptr = realloc (ptr, size); Err thinkerwim.openbsd.amsterdam 70 i if (nptr == NULL) Err thinkerwim.openbsd.amsterdam 70 i { Err thinkerwim.openbsd.amsterdam 70 i- fprintf (stderr, _("xrealloc(): couldn't reallocate %d bytes\n"), size); Err thinkerwim.openbsd.amsterdam 70 i+ fprintf (stderr, _("xrealloc(): couldn't reallocate %zd bytes\n"), size); Err thinkerwim.openbsd.amsterdam 70 i exit (1); Err thinkerwim.openbsd.amsterdam 70 i } Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 1diff --git a/src/gsint.h b/src/gsint.h /git/enscript/file/src/gsint.h.gph thinkerwim.org 70 i@@ -130,7 +130,7 @@ extern double atan2 ___P ((double, double)); Err thinkerwim.openbsd.amsterdam 70 i (('0' <= (ch) && (ch) <= '9') || (ch) == '.' || (ch) == '-' || (ch) == '+') Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i /* Return the width of the character */ Err thinkerwim.openbsd.amsterdam 70 i-#define CHAR_WIDTH(ch) (font_widths[(unsigned char) (ch)]) Err thinkerwim.openbsd.amsterdam 70 i+#define FNT_CHAR_WIDTH(ch) (font_widths[(unsigned char) (ch)]) Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i /* Current point y movement from line to line. */ Err thinkerwim.openbsd.amsterdam 70 i #define LINESKIP (Fpt.h + baselineskip) Err thinkerwim.openbsd.amsterdam 70 1diff --git a/src/main.c b/src/main.c /git/enscript/file/src/main.c.gph thinkerwim.org 70 i@@ -1468,7 +1468,8 @@ name width\theight\tllx\tlly\turx\tury\n\ Err thinkerwim.openbsd.amsterdam 70 i buffer_append (&buffer, enscript_library); Err thinkerwim.openbsd.amsterdam 70 i buffer_append (&buffer, "/hl/*.st"); Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i- system (buffer_ptr (&buffer)); Err thinkerwim.openbsd.amsterdam 70 i+ if (system (buffer_ptr (&buffer)) < 0) Err thinkerwim.openbsd.amsterdam 70 i+ perror("system"); Err thinkerwim.openbsd.amsterdam 70 i exit (0); Err thinkerwim.openbsd.amsterdam 70 i } Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 1diff --git a/src/psgen.c b/src/psgen.c /git/enscript/file/src/psgen.c.gph thinkerwim.org 70 i@@ -585,8 +585,8 @@ process_file (char *fname_arg, InputStream *is, int is_toc) Err thinkerwim.openbsd.amsterdam 70 i * Count possible line number spaces. This should be enought for 99999 Err thinkerwim.openbsd.amsterdam 70 i * lines Err thinkerwim.openbsd.amsterdam 70 i */ Err thinkerwim.openbsd.amsterdam 70 i- linenumber_space = CHAR_WIDTH ('0') * 5 + 1.0; Err thinkerwim.openbsd.amsterdam 70 i- linenumber_margin = CHAR_WIDTH (':') + CHAR_WIDTH ('m'); Err thinkerwim.openbsd.amsterdam 70 i+ linenumber_space = FNT_CHAR_WIDTH ('0') * 5 + 1.0; Err thinkerwim.openbsd.amsterdam 70 i+ linenumber_margin = FNT_CHAR_WIDTH (':') + FNT_CHAR_WIDTH ('m'); Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i /* We got a new input file. */ Err thinkerwim.openbsd.amsterdam 70 i input_filenum++; Err thinkerwim.openbsd.amsterdam 70 i@@ -1137,7 +1137,7 @@ large for page\n"), Err thinkerwim.openbsd.amsterdam 70 i /* Help macros. */ Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i /* Check if character fits to current line. */ Err thinkerwim.openbsd.amsterdam 70 i-#define FITS_ON_LINE(ch) ((linepos + CHAR_WIDTH (ch) < linew) || col == 0) Err thinkerwim.openbsd.amsterdam 70 i+#define FITS_ON_LINE(ch) ((linepos + FNT_CHAR_WIDTH (ch) < linew) || col == 0) Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i /* Is line buffer empty? */ Err thinkerwim.openbsd.amsterdam 70 i #define BUFFER_EMPTY() (bufpos == 0) Err thinkerwim.openbsd.amsterdam 70 i@@ -1160,13 +1160,13 @@ large for page\n"), Err thinkerwim.openbsd.amsterdam 70 i #define EMIT(ch) \ Err thinkerwim.openbsd.amsterdam 70 i do { \ Err thinkerwim.openbsd.amsterdam 70 i APPEND_CHAR (ch); \ Err thinkerwim.openbsd.amsterdam 70 i- linepos += CHAR_WIDTH (ch); \ Err thinkerwim.openbsd.amsterdam 70 i+ linepos += FNT_CHAR_WIDTH (ch); \ Err thinkerwim.openbsd.amsterdam 70 i col++; \ Err thinkerwim.openbsd.amsterdam 70 i } while (0) Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i #define UNEMIT(ch) \ Err thinkerwim.openbsd.amsterdam 70 i do { \ Err thinkerwim.openbsd.amsterdam 70 i- linepos -= CHAR_WIDTH (ch); \ Err thinkerwim.openbsd.amsterdam 70 i+ linepos -= FNT_CHAR_WIDTH (ch); \ Err thinkerwim.openbsd.amsterdam 70 i col--; \ Err thinkerwim.openbsd.amsterdam 70 i } while (0) Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i@@ -1690,7 +1690,7 @@ get_next_token (InputStream *is, double linestart, double linepos, Err thinkerwim.openbsd.amsterdam 70 i { Err thinkerwim.openbsd.amsterdam 70 i /* Proportional font. */ Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i- double grid = tabsize * CHAR_WIDTH (' '); Err thinkerwim.openbsd.amsterdam 70 i+ double grid = tabsize * FNT_CHAR_WIDTH (' '); Err thinkerwim.openbsd.amsterdam 70 i col++; Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i /* Move linepos to the next multiple of . */ Err thinkerwim.openbsd.amsterdam 70 i@@ -1748,9 +1748,9 @@ get_next_token (InputStream *is, double linestart, double linepos, Err thinkerwim.openbsd.amsterdam 70 i if (ch == bs) Err thinkerwim.openbsd.amsterdam 70 i { Err thinkerwim.openbsd.amsterdam 70 i if (BUFFER_EMPTY () || !EXISTS (buffer[bufpos - 1])) Err thinkerwim.openbsd.amsterdam 70 i- linepos -= CHAR_WIDTH ('m'); Err thinkerwim.openbsd.amsterdam 70 i+ linepos -= FNT_CHAR_WIDTH ('m'); Err thinkerwim.openbsd.amsterdam 70 i else Err thinkerwim.openbsd.amsterdam 70 i- linepos -= CHAR_WIDTH (buffer[bufpos - 1]); Err thinkerwim.openbsd.amsterdam 70 i+ linepos -= FNT_CHAR_WIDTH (buffer[bufpos - 1]); Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i done = DONE_DONE; Err thinkerwim.openbsd.amsterdam 70 i break; Err thinkerwim.openbsd.amsterdam 70 i@@ -1775,7 +1775,7 @@ get_next_token (InputStream *is, double linestart, double linepos, Err thinkerwim.openbsd.amsterdam 70 i APPEND_CHAR (buf[i]); Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i /* Update current point counters manually. */ Err thinkerwim.openbsd.amsterdam 70 i- linepos += CHAR_WIDTH (ch); Err thinkerwim.openbsd.amsterdam 70 i+ linepos += FNT_CHAR_WIDTH (ch); Err thinkerwim.openbsd.amsterdam 70 i col++; Err thinkerwim.openbsd.amsterdam 70 i } Err thinkerwim.openbsd.amsterdam 70 i else if (ch == '(' || ch == ')' || ch == '\\') Err thinkerwim.openbsd.amsterdam 70 i@@ -1848,7 +1848,7 @@ get_next_token (InputStream *is, double linestart, double linepos, Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i /* Count length. */ Err thinkerwim.openbsd.amsterdam 70 i for (i = 0; buf[i]; i++) Err thinkerwim.openbsd.amsterdam 70 i- len += CHAR_WIDTH (buf[i]); Err thinkerwim.openbsd.amsterdam 70 i+ len += FNT_CHAR_WIDTH (buf[i]); Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i if (linepos + len < linew || col == 0) Err thinkerwim.openbsd.amsterdam 70 i { Err thinkerwim.openbsd.amsterdam 70 i@@ -2472,7 +2472,7 @@ recognize_eps_file (Token *token) Err thinkerwim.openbsd.amsterdam 70 i /* No, this BoundingBox comment is corrupted. */ Err thinkerwim.openbsd.amsterdam 70 i MESSAGE (0, (stderr, _("EPS file \"%s\" contains malformed \ Err thinkerwim.openbsd.amsterdam 70 i %%%%BoundingBox row:\n\"%.*s\"\n"), Err thinkerwim.openbsd.amsterdam 70 i- token->u.epsf.filename, strlen (buf) - 1, buf)); Err thinkerwim.openbsd.amsterdam 70 i+ token->u.epsf.filename, (int)(strlen (buf) - 1), buf)); Err thinkerwim.openbsd.amsterdam 70 i break; Err thinkerwim.openbsd.amsterdam 70 i } Err thinkerwim.openbsd.amsterdam 70 i } Err thinkerwim.openbsd.amsterdam 70 i@@ -2599,7 +2599,7 @@ read_float (InputStream *is, int units, int horizontal) Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i case 'l': /* lines or characters */ Err thinkerwim.openbsd.amsterdam 70 i if (horizontal) Err thinkerwim.openbsd.amsterdam 70 i- val *= CHAR_WIDTH ('m'); Err thinkerwim.openbsd.amsterdam 70 i+ val *= FNT_CHAR_WIDTH ('m'); Err thinkerwim.openbsd.amsterdam 70 i else Err thinkerwim.openbsd.amsterdam 70 i val *= LINESKIP; Err thinkerwim.openbsd.amsterdam 70 i break; Err thinkerwim.openbsd.amsterdam 70 i@@ -2728,7 +2728,7 @@ print_line_number (double x, double y, double space, double margin, Err thinkerwim.openbsd.amsterdam 70 i int i; Err thinkerwim.openbsd.amsterdam 70 i char *saved_Fname = ""; Err thinkerwim.openbsd.amsterdam 70 i FontPoint saved_Fpt; Err thinkerwim.openbsd.amsterdam 70 i- InputEncoding saved_Fencoding; Err thinkerwim.openbsd.amsterdam 70 i+ InputEncoding saved_Fencoding = 0; Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i saved_Fpt.w = 0.0; Err thinkerwim.openbsd.amsterdam 70 i saved_Fpt.h = 0.0; Err thinkerwim.openbsd.amsterdam 70 i@@ -2758,7 +2758,7 @@ print_line_number (double x, double y, double space, double margin, Err thinkerwim.openbsd.amsterdam 70 i /* Count linenumber string length. */ Err thinkerwim.openbsd.amsterdam 70 i sprintf (buf, "%d", linenum); Err thinkerwim.openbsd.amsterdam 70 i for (i = 0; buf[i]; i++) Err thinkerwim.openbsd.amsterdam 70 i- len += CHAR_WIDTH (buf[i]); Err thinkerwim.openbsd.amsterdam 70 i+ len += FNT_CHAR_WIDTH (buf[i]); Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i /* Print line numbers. */ Err thinkerwim.openbsd.amsterdam 70 i OUTPUT ((cofp, "%g %g M (%s:) s\n", x + space - len, y, buf)); Err thinkerwim.openbsd.amsterdam 70 i@@ -2781,8 +2781,6 @@ print_line_number (double x, double y, double space, double margin, Err thinkerwim.openbsd.amsterdam 70 i * The name of the divert file, shared between divert() and undivert() Err thinkerwim.openbsd.amsterdam 70 i * functions. Err thinkerwim.openbsd.amsterdam 70 i */ Err thinkerwim.openbsd.amsterdam 70 i-static char divertfname[512]; Err thinkerwim.openbsd.amsterdam 70 i- Err thinkerwim.openbsd.amsterdam 70 i static void Err thinkerwim.openbsd.amsterdam 70 i divert () Err thinkerwim.openbsd.amsterdam 70 i { Err thinkerwim.openbsd.amsterdam 70 1diff --git a/src/util.c b/src/util.c /git/enscript/file/src/util.c.gph thinkerwim.org 70 i@@ -639,7 +639,7 @@ paste_file (char *name, char *suffix) Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i if (j >= sizeof (name) - 1) Err thinkerwim.openbsd.amsterdam 70 i FATAL ((stderr, _("%s:%d: %%Format: too long name, maxlen=%d"), Err thinkerwim.openbsd.amsterdam 70 i- buffer_ptr (ctx.fullname), line, sizeof (name) - 1)); Err thinkerwim.openbsd.amsterdam 70 i+ buffer_ptr (ctx.fullname), line, (int)(sizeof (name) - 1))); Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i /* Find the start of the format string. */ Err thinkerwim.openbsd.amsterdam 70 i for (; buf[i] && isspace (buf[i]); i++) Err thinkerwim.openbsd.amsterdam 70 i@@ -1370,7 +1370,8 @@ format_user_string (char *context_name, char *str) Err thinkerwim.openbsd.amsterdam 70 i break; Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i case 'c': /* `%c' trailing component of pwd. */ Err thinkerwim.openbsd.amsterdam 70 i- getcwd (buf, sizeof (buf)); Err thinkerwim.openbsd.amsterdam 70 i+ if (!getcwd (buf, sizeof (buf))) Err thinkerwim.openbsd.amsterdam 70 i+ perror("getcwd"); Err thinkerwim.openbsd.amsterdam 70 i cp = strrchr (buf, '/'); Err thinkerwim.openbsd.amsterdam 70 i if (cp) Err thinkerwim.openbsd.amsterdam 70 i cp++; Err thinkerwim.openbsd.amsterdam 70 i@@ -1386,7 +1387,8 @@ format_user_string (char *context_name, char *str) Err thinkerwim.openbsd.amsterdam 70 i break; Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i case 'd': /* `%d' current working directory */ Err thinkerwim.openbsd.amsterdam 70 i- getcwd (buf, sizeof (buf)); Err thinkerwim.openbsd.amsterdam 70 i+ if (!getcwd (buf, sizeof (buf))) Err thinkerwim.openbsd.amsterdam 70 i+ perror("getcwd"); Err thinkerwim.openbsd.amsterdam 70 i APPEND_STR (buf); Err thinkerwim.openbsd.amsterdam 70 i break; Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i@@ -1854,7 +1856,7 @@ parse_float (char *string, int units, int horizontal) Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i case 'l': Err thinkerwim.openbsd.amsterdam 70 i if (horizontal) Err thinkerwim.openbsd.amsterdam 70 i- val *= CHAR_WIDTH ('m'); Err thinkerwim.openbsd.amsterdam 70 i+ val *= FNT_CHAR_WIDTH ('m'); Err thinkerwim.openbsd.amsterdam 70 i else Err thinkerwim.openbsd.amsterdam 70 i val *= LINESKIP; Err thinkerwim.openbsd.amsterdam 70 i break; Err thinkerwim.openbsd.amsterdam 70 1diff --git a/states/main.c b/states/main.c /git/enscript/file/states/main.c.gph thinkerwim.org 70 i@@ -371,7 +371,7 @@ main (argc, argv) Err thinkerwim.openbsd.amsterdam 70 i if (cp) Err thinkerwim.openbsd.amsterdam 70 i { Err thinkerwim.openbsd.amsterdam 70 i path = xmalloc (cp - defs_file + 3); Err thinkerwim.openbsd.amsterdam 70 i- sprintf (path, ".%c%.*s", PATH_SEPARATOR, cp - defs_file, defs_file); Err thinkerwim.openbsd.amsterdam 70 i+ sprintf (path, ".%c%.*s", PATH_SEPARATOR, (int)(cp - defs_file), defs_file); Err thinkerwim.openbsd.amsterdam 70 i } Err thinkerwim.openbsd.amsterdam 70 i else Err thinkerwim.openbsd.amsterdam 70 i path = "."; Err thinkerwim.openbsd.amsterdam 70 1diff --git a/states/utils.c b/states/utils.c /git/enscript/file/states/utils.c.gph thinkerwim.org 70 i@@ -833,7 +833,7 @@ eval_expr (expr, env) Err thinkerwim.openbsd.amsterdam 70 i { Err thinkerwim.openbsd.amsterdam 70 i Environment *nenv = NULL; Err thinkerwim.openbsd.amsterdam 70 i ListItem *i, *e; Err thinkerwim.openbsd.amsterdam 70 i- List *stmts; Err thinkerwim.openbsd.amsterdam 70 i+ List *stmts __attribute__ ((__unused__)); Err thinkerwim.openbsd.amsterdam 70 i List *lst; Err thinkerwim.openbsd.amsterdam 70 i Cons *args_locals; Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 .