head 1.1; access; symbols pkgsrc-2026Q1:1.1.0.112 pkgsrc-2026Q1-base:1.1 pkgsrc-2025Q4:1.1.0.110 pkgsrc-2025Q4-base:1.1 pkgsrc-2025Q3:1.1.0.108 pkgsrc-2025Q3-base:1.1 pkgsrc-2025Q2:1.1.0.106 pkgsrc-2025Q2-base:1.1 pkgsrc-2025Q1:1.1.0.104 pkgsrc-2025Q1-base:1.1 pkgsrc-2024Q4:1.1.0.102 pkgsrc-2024Q4-base:1.1 pkgsrc-2024Q3:1.1.0.100 pkgsrc-2024Q3-base:1.1 pkgsrc-2024Q2:1.1.0.98 pkgsrc-2024Q2-base:1.1 pkgsrc-2024Q1:1.1.0.96 pkgsrc-2024Q1-base:1.1 pkgsrc-2023Q4:1.1.0.94 pkgsrc-2023Q4-base:1.1 pkgsrc-2023Q3:1.1.0.92 pkgsrc-2023Q3-base:1.1 pkgsrc-2023Q2:1.1.0.90 pkgsrc-2023Q2-base:1.1 pkgsrc-2023Q1:1.1.0.88 pkgsrc-2023Q1-base:1.1 pkgsrc-2022Q4:1.1.0.86 pkgsrc-2022Q4-base:1.1 pkgsrc-2022Q3:1.1.0.84 pkgsrc-2022Q3-base:1.1 pkgsrc-2022Q2:1.1.0.82 pkgsrc-2022Q2-base:1.1 pkgsrc-2022Q1:1.1.0.80 pkgsrc-2022Q1-base:1.1 pkgsrc-2021Q4:1.1.0.78 pkgsrc-2021Q4-base:1.1 pkgsrc-2021Q3:1.1.0.76 pkgsrc-2021Q3-base:1.1 pkgsrc-2021Q2:1.1.0.74 pkgsrc-2021Q2-base:1.1 pkgsrc-2021Q1:1.1.0.72 pkgsrc-2021Q1-base:1.1 pkgsrc-2020Q4:1.1.0.70 pkgsrc-2020Q4-base:1.1 pkgsrc-2020Q3:1.1.0.68 pkgsrc-2020Q3-base:1.1 pkgsrc-2020Q2:1.1.0.64 pkgsrc-2020Q2-base:1.1 pkgsrc-2020Q1:1.1.0.44 pkgsrc-2020Q1-base:1.1 pkgsrc-2019Q4:1.1.0.66 pkgsrc-2019Q4-base:1.1 pkgsrc-2019Q3:1.1.0.62 pkgsrc-2019Q3-base:1.1 pkgsrc-2019Q2:1.1.0.60 pkgsrc-2019Q2-base:1.1 pkgsrc-2019Q1:1.1.0.58 pkgsrc-2019Q1-base:1.1 pkgsrc-2018Q4:1.1.0.56 pkgsrc-2018Q4-base:1.1 pkgsrc-2018Q3:1.1.0.54 pkgsrc-2018Q3-base:1.1 pkgsrc-2018Q2:1.1.0.52 pkgsrc-2018Q2-base:1.1 pkgsrc-2018Q1:1.1.0.50 pkgsrc-2018Q1-base:1.1 pkgsrc-2017Q4:1.1.0.48 pkgsrc-2017Q4-base:1.1 pkgsrc-2017Q3:1.1.0.46 pkgsrc-2017Q3-base:1.1 pkgsrc-2017Q2:1.1.0.42 pkgsrc-2017Q2-base:1.1 pkgsrc-2017Q1:1.1.0.40 pkgsrc-2017Q1-base:1.1 pkgsrc-2016Q4:1.1.0.38 pkgsrc-2016Q4-base:1.1 pkgsrc-2016Q3:1.1.0.36 pkgsrc-2016Q3-base:1.1 pkgsrc-2016Q2:1.1.0.34 pkgsrc-2016Q2-base:1.1 pkgsrc-2016Q1:1.1.0.32 pkgsrc-2016Q1-base:1.1 pkgsrc-2015Q4:1.1.0.30 pkgsrc-2015Q4-base:1.1 pkgsrc-2015Q3:1.1.0.28 pkgsrc-2015Q3-base:1.1 pkgsrc-2015Q2:1.1.0.26 pkgsrc-2015Q2-base:1.1 pkgsrc-2015Q1:1.1.0.24 pkgsrc-2015Q1-base:1.1 pkgsrc-2014Q4:1.1.0.22 pkgsrc-2014Q4-base:1.1 pkgsrc-2014Q3:1.1.0.20 pkgsrc-2014Q3-base:1.1 pkgsrc-2014Q2:1.1.0.18 pkgsrc-2014Q2-base:1.1 pkgsrc-2014Q1:1.1.0.16 pkgsrc-2014Q1-base:1.1 pkgsrc-2013Q4:1.1.0.14 pkgsrc-2013Q4-base:1.1 pkgsrc-2013Q3:1.1.0.12 pkgsrc-2013Q3-base:1.1 pkgsrc-2013Q2:1.1.0.10 pkgsrc-2013Q2-base:1.1 pkgsrc-2013Q1:1.1.0.8 pkgsrc-2013Q1-base:1.1 pkgsrc-2012Q4:1.1.0.6 pkgsrc-2012Q4-base:1.1 pkgsrc-2012Q3:1.1.0.4 pkgsrc-2012Q3-base:1.1 pkgsrc-2012Q2:1.1.0.2 pkgsrc-2012Q2-base:1.1; locks; strict; comment @# @; 1.1 date 2012.05.10.20.53.30; author dholland; state Exp; branches; next ; desc @@ 1.1 log @Pass -Wall. Fix a number of minor bugs and possibly some major ones. Should also fix clang build. PKGREVISION++ @ text @$NetBSD$ - don't use implicit int - silence gcc braces warning - silence initialization warning seen with gcc 4.1 - fix signed/unsigned pointer conversions --- src/input.c~ 2012-05-10 19:25:36.000000000 +0000 +++ src/input.c @@@@ -59,7 +59,7 @@@@ extern struct passwd *getpwnam(); */ #if !WINDOW_MSWIN /* for MS Windows, mlyesno is defined in mswsys.c */ -PASCAL NEAR mlyesno(prompt) +int PASCAL NEAR mlyesno(prompt) char *prompt; @@@@ -106,7 +106,7 @@@@ char *prompt; * return. Handle erase, kill, and abort keys. */ -PASCAL NEAR mlreply(prompt, buf, nbuf) +int PASCAL NEAR mlreply(prompt, buf, nbuf) char *prompt; char *buf; @@@@ -119,7 +119,7 @@@@ int nbuf; /* ectoc: expanded character to character collapse the CTRL and SPEC flags back into an ascii code */ -PASCAL NEAR ectoc(c) +int PASCAL NEAR ectoc(c) int c; @@@@ -136,7 +136,7 @@@@ int c; /* ctoec: character to extended character pull out the CTRL and SPEC prefixes (if possible) */ -PASCAL NEAR ctoec(c) +int PASCAL NEAR ctoec(c) int c; @@@@ -259,13 +259,14 @@@@ int maxlen; /* maximum length of input cpos = 0; /* if it exists, prompt the user for a buffer name */ - if (prompt) + if (prompt) { if (type == CMP_COMMAND) mlwrite("%s", prompt); else if (defval) mlwrite("%s[%s]: ", prompt, defval); else mlwrite("%s: ", prompt); + } /* build a name string from the keyboard */ while (TRUE) { @@@@ -737,6 +738,9 @@@@ int *cpos; /* ptr to position of next ch char longestmatch[NSTRING]; /* temp buffer for longest match */ int longestlen; /* length of longest match (always > *cpos) */ + /* required by gcc 4.1 */ + longestlen = 0; + /* everything (or nothing) matches an empty string */ if (*cpos == 0) return; @@@@ -986,13 +990,14 @@@@ int PASCAL NEAR getcmd() to specify the proper terminator. If the terminator is not a return('\r'), return will echo as "" */ -int PASCAL NEAR getstring(buf, nbuf, eolchar) +int PASCAL NEAR getstring(buf_c, nbuf, eolchar) -unsigned char *buf; +char *buf_c; int nbuf; int eolchar; { + unsigned char *buf; register int cpos; /* current character position in string */ register int c; /* current input character */ register int ec; /* extended current input character */ @@@@ -1000,6 +1005,8 @@@@ int eolchar; char *kp; /* pointer into key_name */ char key_name[10]; /* name of a quoted key */ + buf = (unsigned char *)buf_c; + cpos = 0; quotef = FALSE; @@@@ -1136,7 +1143,7 @@@@ int eolchar; } } -PASCAL NEAR outstring(s) /* output a string of input characters */ +VOID PASCAL NEAR outstring(s) /* output a string of input characters */ char *s; /* string to output */ @@@@ -1146,7 +1153,7 @@@@ char *s; /* string to output */ mlout(*s++); } -PASCAL NEAR ostring(s) /* output a string of output characters */ +VOID PASCAL NEAR ostring(s) /* output a string of output characters */ char *s; /* string to output */ @