head 1.1; access; symbols pkgsrc-2026Q1:1.1.0.108 pkgsrc-2026Q1-base:1.1 pkgsrc-2025Q4:1.1.0.106 pkgsrc-2025Q4-base:1.1 pkgsrc-2025Q3:1.1.0.104 pkgsrc-2025Q3-base:1.1 pkgsrc-2025Q2:1.1.0.102 pkgsrc-2025Q2-base:1.1 pkgsrc-2025Q1:1.1.0.100 pkgsrc-2025Q1-base:1.1 pkgsrc-2024Q4:1.1.0.98 pkgsrc-2024Q4-base:1.1 pkgsrc-2024Q3:1.1.0.96 pkgsrc-2024Q3-base:1.1 pkgsrc-2024Q2:1.1.0.94 pkgsrc-2024Q2-base:1.1 pkgsrc-2024Q1:1.1.0.92 pkgsrc-2024Q1-base:1.1 pkgsrc-2023Q4:1.1.0.90 pkgsrc-2023Q4-base:1.1 pkgsrc-2023Q3:1.1.0.88 pkgsrc-2023Q3-base:1.1 pkgsrc-2023Q2:1.1.0.86 pkgsrc-2023Q2-base:1.1 pkgsrc-2023Q1:1.1.0.84 pkgsrc-2023Q1-base:1.1 pkgsrc-2022Q4:1.1.0.82 pkgsrc-2022Q4-base:1.1 pkgsrc-2022Q3:1.1.0.80 pkgsrc-2022Q3-base:1.1 pkgsrc-2022Q2:1.1.0.78 pkgsrc-2022Q2-base:1.1 pkgsrc-2022Q1:1.1.0.76 pkgsrc-2022Q1-base:1.1 pkgsrc-2021Q4:1.1.0.74 pkgsrc-2021Q4-base:1.1 pkgsrc-2021Q3:1.1.0.72 pkgsrc-2021Q3-base:1.1 pkgsrc-2021Q2:1.1.0.70 pkgsrc-2021Q2-base:1.1 pkgsrc-2021Q1:1.1.0.68 pkgsrc-2021Q1-base:1.1 pkgsrc-2020Q4:1.1.0.66 pkgsrc-2020Q4-base:1.1 pkgsrc-2020Q3:1.1.0.64 pkgsrc-2020Q3-base:1.1 pkgsrc-2020Q2:1.1.0.60 pkgsrc-2020Q2-base:1.1 pkgsrc-2020Q1:1.1.0.40 pkgsrc-2020Q1-base:1.1 pkgsrc-2019Q4:1.1.0.62 pkgsrc-2019Q4-base:1.1 pkgsrc-2019Q3:1.1.0.58 pkgsrc-2019Q3-base:1.1 pkgsrc-2019Q2:1.1.0.56 pkgsrc-2019Q2-base:1.1 pkgsrc-2019Q1:1.1.0.54 pkgsrc-2019Q1-base:1.1 pkgsrc-2018Q4:1.1.0.52 pkgsrc-2018Q4-base:1.1 pkgsrc-2018Q3:1.1.0.50 pkgsrc-2018Q3-base:1.1 pkgsrc-2018Q2:1.1.0.48 pkgsrc-2018Q2-base:1.1 pkgsrc-2018Q1:1.1.0.46 pkgsrc-2018Q1-base:1.1 pkgsrc-2017Q4:1.1.0.44 pkgsrc-2017Q4-base:1.1 pkgsrc-2017Q3:1.1.0.42 pkgsrc-2017Q3-base:1.1 pkgsrc-2017Q2:1.1.0.38 pkgsrc-2017Q2-base:1.1 pkgsrc-2017Q1:1.1.0.36 pkgsrc-2017Q1-base:1.1 pkgsrc-2016Q4:1.1.0.34 pkgsrc-2016Q4-base:1.1 pkgsrc-2016Q3:1.1.0.32 pkgsrc-2016Q3-base:1.1 pkgsrc-2016Q2:1.1.0.30 pkgsrc-2016Q2-base:1.1 pkgsrc-2016Q1:1.1.0.28 pkgsrc-2016Q1-base:1.1 pkgsrc-2015Q4:1.1.0.26 pkgsrc-2015Q4-base:1.1 pkgsrc-2015Q3:1.1.0.24 pkgsrc-2015Q3-base:1.1 pkgsrc-2015Q2:1.1.0.22 pkgsrc-2015Q2-base:1.1 pkgsrc-2015Q1:1.1.0.20 pkgsrc-2015Q1-base:1.1 pkgsrc-2014Q4:1.1.0.18 pkgsrc-2014Q4-base:1.1 pkgsrc-2014Q3:1.1.0.16 pkgsrc-2014Q3-base:1.1 pkgsrc-2014Q2:1.1.0.14 pkgsrc-2014Q2-base:1.1 pkgsrc-2014Q1:1.1.0.12 pkgsrc-2014Q1-base:1.1 pkgsrc-2013Q4:1.1.0.10 pkgsrc-2013Q4-base:1.1 pkgsrc-2013Q3:1.1.0.8 pkgsrc-2013Q3-base:1.1 pkgsrc-2013Q2:1.1.0.6 pkgsrc-2013Q2-base:1.1 pkgsrc-2013Q1:1.1.0.4 pkgsrc-2013Q1-base:1.1 pkgsrc-2012Q4:1.1.0.2 pkgsrc-2012Q4-base:1.1; locks; strict; comment @# @; 1.1 date 2012.12.28.03.03.09; author dholland; state Exp; branches; next ; desc @@ 1.1 log @Fix legacy C. Pass -Wall -W -Wmissing-declarations -Wwrite-strings on gcc45. - avoid implicit int, declare void functions void - return values from non-void functions - put most external declarations properly in header files - use some static and const - fix up a big mess with function pointer casting - use standard includes, don't provide own decls of standard functions - use types matching libc when providing own malloc, printf, and putchar - use functions correctly - silence assorted compiler warnings - fix some bugs exposed by compiler warnings - don't intentionally exercise signed overflow - remove some unused items - add patch comments to other patch (patch-aa) As this includes several fixes and removes some undefined behavior on a commonly reachable code path, bump PKGREVISION. @ text @$NetBSD$ - declare local functions static - declare void functions void - don't declare local functions in headers - silence warnings about assignments in conditionals - avoid implicit int - silence warnings about unused arguments --- ex_v.c~ 2012-12-27 21:58:42.000000000 +0000 +++ ex_v.c @@@@ -127,9 +127,10 @@@@ static char sccsid[] = "@@(#)ex_v.c 1.14 JMP_BUF venv; -int ovbeg __P((void)); -int setwind __P((void)); -int vok __P((cell *)); +static void ovbeg __P((void)); +static void ovend __P((ttymode f)); +static void setwind __P((void)); +static void vok __P((cell *)); /* * Enter open mode @@@@ -137,6 +138,7 @@@@ int vok __P((cell *)); #ifdef u370 cell atube[TUBESIZE+LBSIZE]; #endif +void oop() { register char *ic; @@@@ -146,7 +148,7 @@@@ oop() ttymode f; /* mjm: was register */ int resize; - if (resize = SETJMP(venv)) { + if ((resize = SETJMP(venv)) != 0) { setsize(); initev = (char *)0; inopen = 0; @@@@ -217,7 +219,8 @@@@ oop() #endif } -ovbeg() +static void +ovbeg(void) { if (!value(OPEN)) @@@@ -233,8 +236,8 @@@@ ovbeg() dot = addr2; } -ovend(f) - ttymode f; +static void +ovend(ttymode f) { splitw++; @@@@ -255,6 +258,7 @@@@ ovend(f) /* * Enter visual mode */ +void vop() { register int c; @@@@ -292,7 +296,7 @@@@ toopen: goto toopen; error(catgets(catd, 1, 214, "Visual requires scrolling")); } - if (resize = SETJMP(venv)) { + if ((resize = SETJMP(venv)) != 0) { setsize(); initev = (char *)0; inopen = 0; @@@@ -333,6 +337,7 @@@@ toopen: * empty buffer since routines internally * demand at least one line. */ +void fixzero() { @@@@ -361,6 +366,7 @@@@ fixzero() * at some point, and then quit from the visual and undo * you get the old file back. Somewhat weird. */ +void savevis() { @@@@ -376,6 +382,7 @@@@ savevis() * Restore a sensible state after a visual/open, moving the saved * stuff back to [unddol,dol], and killing the partial line kill indicators. */ +void undvis() { @@@@ -396,6 +403,7 @@@@ undvis() * Set the window parameters based on the base state bastate * and the available buffer space. */ +static void setwind() { @@@@ -436,6 +444,7 @@@@ setwind() * If so, then divide the screen buffer up into lines, * and initialize a bunch of state variables before we start. */ +static void vok(atube) register cell *atube; { @@@@ -478,11 +487,13 @@@@ vok(atube) #ifdef CBREAK woid -vintr(signum) +vintr(int signum) { extern JMP_BUF readbuf; extern int doingread; + (void)signum; + signal(SIGINT, vintr); if (vcatch) onintr(SIGINT); @@@@ -499,6 +510,7 @@@@ vintr(signum) * Set the size of the screen to size lines, to take effect the * next time the screen is redrawn. */ +void vsetsiz(size) int size; { @@@@ -517,8 +529,10 @@@@ vsetsiz(size) #ifdef SIGWINCH woid -onwinch(signum) +onwinch(int signum) { + (void)signum; + vsave(); setty(normf); LONGJMP(venv, 1); @