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$ - use standard headers - don't use implicit int - const correctness required by existing const declarations - silence initialize warning seen with gcc 4.1 --- src/file.c~ 2012-05-10 19:25:36.000000000 +0000 +++ src/file.c @@@@ -7,6 +7,7 @@@@ */ #include +#include #include "estruct.h" #include "eproto.h" #include "edef.h" @@@@ -23,7 +24,7 @@@@ * "read a file into the current buffer" code. * Bound to "C-X C-R". */ -PASCAL NEAR fileread(f, n) +int PASCAL NEAR fileread(f, n) int f, n; /* defualt and numeric arguments (unused) */ @@@@ -46,7 +47,7 @@@@ int f, n; /* defualt and numeric argumen * "insert a file into the current buffer" code. * Bound to "C-X C-I". */ -PASCAL NEAR insfile(f, n) +int PASCAL NEAR insfile(f, n) int f,n; /* prefix flag and argument */ @@@@ -55,6 +56,9 @@@@ int f,n; /* prefix flag and argument */ char *fname; /* file name */ LINE *curline; + /* required by gcc 4.1 */ + curline = NULL; + if (restflag) /* don't allow this command if restricted */ return(resterr()); if (curbp->b_mode&MDVIEW) /* don't allow this command if */ @@@@ -89,7 +93,7 @@@@ int f,n; /* prefix flag and argument */ * text, and switch to the new buffer. * Bound to C-X C-F. */ -PASCAL NEAR filefind(f, n) +int PASCAL NEAR filefind(f, n) int f,n; /* prefix flag and argument */ @@@@ -105,7 +109,7 @@@@ int f,n; /* prefix flag and argument */ return(getfile(fname, TRUE)); } -PASCAL NEAR viewfile(f, n) /* visit a file in VIEW mode */ +int PASCAL NEAR viewfile(f, n) /* visit a file in VIEW mode */ int f,n; /* prefix flag and argument */ @@@@ -128,7 +132,7 @@@@ int f,n; /* prefix flag and argument */ } #if CRYPT -PASCAL NEAR resetkey() /* reset the encryption key if needed */ +int PASCAL NEAR resetkey() /* reset the encryption key if needed */ { register int s; /* return status */ @@@@ -161,9 +165,9 @@@@ PASCAL NEAR resetkey() /* reset the encr } #endif -PASCAL NEAR getfile(fname, lockfl) +int PASCAL NEAR getfile(fname, lockfl) -char fname[]; /* file name to find */ +CONST char fname[]; /* file name to find */ int lockfl; /* check the file for locks? */ { @@@@ -252,9 +256,9 @@@@ int lockfl; /* check the file for locks and before it is read. */ -PASCAL NEAR readin(fname, lockfl) +int PASCAL NEAR readin(fname, lockfl) -char fname[]; /* name of file to read */ +CONST char fname[]; /* name of file to read */ int lockfl; /* check for file locks? */ { @@@@ -386,15 +390,15 @@@@ out: * Returns a pointer into fname indicating the end of the file path; i.e., * 1 character BEYOND the path name. */ -char *PASCAL NEAR makename(bname, fname) +CONST char *PASCAL NEAR makename(bname, fname) char *bname; -char *fname; +CONST char *fname; { - register char *cp1; + register CONST char *cp1; register char *cp2; - register char *pathp; + register CONST char *pathp; #if AOSVS | MV_UX resolve_full_pathname(fname, fname); @@@@ -480,7 +484,7 @@@@ char *name; /* name to check on */ * and ^X^A for appending. */ -PASCAL NEAR filewrite(f, n) +int PASCAL NEAR filewrite(f, n) int f, n; /* emacs arguments */ @@@@ -503,7 +507,7 @@@@ int f, n; /* emacs arguments */ return(s); } -PASCAL NEAR fileapp(f, n) /* append file */ +int PASCAL NEAR fileapp(f, n) /* append file */ int f, n; /* emacs arguments */ @@@@ -532,7 +536,7 @@@@ int f, n; /* emacs arguments */ * name for the buffer. Bound to "C-X C-S". May * get called by "C-Z". */ -PASCAL NEAR filesave(f, n) +int PASCAL NEAR filesave(f, n) int f,n; /* prefix flag and argument */ @@@@ -588,7 +592,7 @@@@ int f,n; /* prefix flag and argument */ * a user specifyable routine (in $writehook) can be run. */ -PASCAL NEAR writeout(fn, mode) +int PASCAL NEAR writeout(fn, mode) char *fn; /* name of file to write current buffer to */ char *mode; /* mode to open file (w = write a = append) */ @@@@ -719,7 +723,7 @@@@ char *mode; /* mode to open file (w = wr * prompt if you wish. */ -PASCAL NEAR filename(f, n) +int PASCAL NEAR filename(f, n) int f,n; /* prefix flag and argument */ @@@@ -747,7 +751,7 @@@@ int f,n; /* prefix flag and argument */ * buffer, Called by insert file command. Return the final * status of the read. */ -PASCAL NEAR ifile(fname) +int PASCAL NEAR ifile(fname) char fname[]; { register LINE *lp0; @@@@ -859,7 +863,7 @@@@ out: names of all the files in a given directory */ -PASCAL NEAR showfiles(f, n) +int PASCAL NEAR showfiles(f, n) int f,n; /* prefix flag and argument */ @