diff options
| author | David Malone <dwmalone@FreeBSD.org> | 2002-09-04 23:29:10 +0000 |
|---|---|---|
| committer | David Malone <dwmalone@FreeBSD.org> | 2002-09-04 23:29:10 +0000 |
| commit | f4ac32def255b5968bdd8150057b9c0d14595689 (patch) | |
| tree | fb230419005f211ecea1e667385bde9886dbf0d8 /usr.bin/pr | |
| parent | d946bf789255a84ecbbbdfd07bffb48da063204f (diff) | |
| download | src-test-f4ac32def255b5968bdd8150057b9c0d14595689.tar.gz src-test-f4ac32def255b5968bdd8150057b9c0d14595689.zip | |
ANSIify function definitions.
Add some constness to avoid some warnings.
Remove use register keyword.
Deal with missing/unneeded extern/prototypes.
Some minor type changes/casts to avoid warnings.
Reviewed by: md5
Notes
Notes:
svn path=/head/; revision=102944
Diffstat (limited to 'usr.bin/pr')
| -rw-r--r-- | usr.bin/pr/extern.h | 4 | ||||
| -rw-r--r-- | usr.bin/pr/pr.c | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/usr.bin/pr/extern.h b/usr.bin/pr/extern.h index 93efa652dbb3a..da552c03e8e88 100644 --- a/usr.bin/pr/extern.h +++ b/usr.bin/pr/extern.h @@ -49,11 +49,11 @@ int inln(FILE *, char *, int, int *, int, int *); int inskip(FILE *, int, int); void mfail(void); int mulfile(int, char **); -FILE *nxtfile(int, char **, char **, char *, int); +FILE *nxtfile(int, char **, const char **, char *, int); int onecol(int, char **); int otln(char *, int, int *, int *, int); void pfail(void); -int prhead(char *, char *, int); +int prhead(char *, const char *, int); int prtail(int, int); int setup(int, char **); void terminate(int); diff --git a/usr.bin/pr/pr.c b/usr.bin/pr/pr.c index 169b6c9128c9e..bef76c528313d 100644 --- a/usr.bin/pr/pr.c +++ b/usr.bin/pr/pr.c @@ -103,7 +103,7 @@ char schar; /* text column separation character */ int sflag; /* -s option for multiple columns */ int nohead; /* do not write head and trailer */ int pgwd; /* page width with multiple col output */ -char *timefrmt; /* time conversion string */ +const char *timefrmt; /* time conversion string */ /* * misc globals @@ -187,7 +187,7 @@ onecol(int argc, char *argv[]) char *hbuf; char *ohbuf; FILE *inf; - char *fname; + const char *fname; int mor; if (nmwd) @@ -339,7 +339,7 @@ vertcol(int argc, char *argv[]) char *buf; char *hbuf; char *ohbuf; - char *fname; + const char *fname; FILE *inf; int ips = 0; int cps = 0; @@ -649,7 +649,7 @@ horzcol(int argc, char *argv[]) char *buf; char *hbuf; char *ohbuf; - char *fname; + const char *fname; FILE *inf; int ips = 0; int cps = 0; @@ -795,7 +795,7 @@ mulfile(int argc, char *argv[]) char *buf; char *hbuf; char *ohbuf; - char *fname; + const char *fname; int ips = 0; int cps = 0; int ops = 0; @@ -1262,7 +1262,7 @@ inskip(FILE *inf, int pgcnt, int lncnt) * dt if set skips the date processing (used with -m) */ FILE * -nxtfile(int argc, char *argv[], char **fname, char *buf, int dt) +nxtfile(int argc, char **argv, const char **fname, char *buf, int dt) { FILE *inf = NULL; struct timeval tv; @@ -1423,7 +1423,7 @@ addnum(char *buf, int wdth, int line) * pagcnt page number */ int -prhead(char *buf, char *fname, int pagcnt) +prhead(char *buf, const char *fname, int pagcnt) { int ips = 0; int ops = 0; |