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.08; 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 - avoid implicit int - use const for string constants - silence warnings about && and || precedence --- ex_set.c~ 2012-12-27 21:58:42.000000000 +0000 +++ ex_set.c @@@@ -88,18 +88,19 @@@@ static char sccsid[] = "@@(#)ex_set.c 1.8 */ char optname[ONMSZ]; -int setend __P((void)); -int prall __P((void)); -int propts __P((void)); -int propt __P((register struct option *)); +static int setend __P((void)); +static void prall __P((void)); +static void propts __P((void)); +static void propt __P((register struct option *)); +void set() { - register char *cp; + register const char *cp; + register char *cp2; register struct option *op; register int c; bool no; - extern short ospeed; setnoaddr(); if (skipend()) { @@@@ -109,12 +110,12 @@@@ set() return; } do { - cp = optname; + cp2 = optname; do { - if (cp < &optname[ONMSZ - 2]) - *cp++ = getchar(); + if (cp2 < &optname[ONMSZ - 2]) + *cp2++ = getchar(); } while (isalnum(peekchar())); - *cp = 0; + *cp2 = 0; cp = optname; if (eq("all", cp)) { if (inopen) @@@@ -146,7 +147,7 @@@@ dontset: cp = "window"; } for (op = options; op < &options[NOPTS]; op++) - if (eq(op->oname, cp) || op->oabbrev && eq(op->oabbrev, cp)) + if (eq(op->oname, cp) || (op->oabbrev && eq(op->oabbrev, cp))) break; if (op->oname == 0) serror(catgets(catd, 1, 159, @@@@ -193,18 +194,18 @@@@ printone: case STRING: case OTERM: - cp = optname; + cp2 = optname; while (!setend()) { - if (cp >= &optname[ONMSZ]) + if (cp2 >= &optname[ONMSZ]) error(catgets(catd, 1, 163, "String too long@@in option assignment")); /* adb change: allow whitepace in strings */ - if( (*cp = getchar()) == '\\') + if( (*cp2 = getchar()) == '\\') if( peekchar() != EOF) - *cp = getchar(); - cp++; + *cp2 = getchar(); + cp2++; } - *cp = 0; + *cp2 = 0; if (op->otype == OTERM) { /* * At first glance it seems like we shouldn't care if the terminal type @@@@ -237,13 +238,15 @@@@ setnext: eol(); } +static int setend() { return (is_white(peekchar()) || endcmd(peekchar())); } -prall() +static void +prall(void) { register int incr = (NOPTS + 2) / 3; register int rows = incr; @@@@ -261,7 +264,8 @@@@ prall() } } -propts() +static void +propts(void) { register struct option *op; @@@@ -292,10 +296,10 @@@@ propts() flush(); } -propt(op) - register struct option *op; +static void +propt(register struct option *op) { - register char *name; + register const char *name; name = op->oname; @