Constify, de-register-ify, and set WARNS=2.

Submitted by:	Mike Barcroft <mike@q9media.com>
This commit is contained in:
Dima Dorfman 2001-07-15 05:47:47 +00:00
parent 04983c4fe5
commit c33fa91f61
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=79750
2 changed files with 15 additions and 12 deletions

View File

@ -2,6 +2,7 @@
# $FreeBSD$ # $FreeBSD$
PROG= tunefs PROG= tunefs
WARNS?= 2
MAN= tunefs.8 MAN= tunefs.8
.include <bsd.prog.mk> .include <bsd.prog.mk>

View File

@ -76,10 +76,10 @@ union {
int fi; int fi;
long dev_bsize = 1; long dev_bsize = 1;
void bwrite __P((daddr_t, char *, int)); void bwrite __P((daddr_t, const char *, int));
int bread __P((daddr_t, char *, int)); int bread __P((daddr_t, char *, int));
void getsb __P((struct fs *, char *)); void getsb __P((struct fs *, const char *));
void putsb __P((struct fs *, char *, int)); void putsb __P((struct fs *, const char *, int));
void usage __P((void)); void usage __P((void));
void printfs __P((void)); void printfs __P((void));
@ -88,7 +88,8 @@ main(argc, argv)
int argc; int argc;
char *argv[]; char *argv[];
{ {
char *special, *name; char *special;
const char *name;
struct stat st; struct stat st;
int Aflag = 0, active = 0; int Aflag = 0, active = 0;
int aflag = 0, dflag = 0, eflag = 0, fflag = 0, mflag = 0; int aflag = 0, dflag = 0, eflag = 0, fflag = 0, mflag = 0;
@ -97,7 +98,8 @@ main(argc, argv)
int mvalue = 0, ovalue = 0, svalue = 0; int mvalue = 0, ovalue = 0, svalue = 0;
char *nvalue = NULL; char *nvalue = NULL;
struct fstab *fs; struct fstab *fs;
char *chg[2], device[MAXPATHLEN]; const char *chg[2];
char device[MAXPATHLEN];
struct ufs_args args; struct ufs_args args;
struct statfs stfs; struct statfs stfs;
int found_arg, ch; int found_arg, ch;
@ -357,8 +359,8 @@ usage()
void void
getsb(fs, file) getsb(fs, file)
register struct fs *fs; struct fs *fs;
char *file; const char *file;
{ {
fi = open(file, O_RDONLY); fi = open(file, O_RDONLY);
@ -373,8 +375,8 @@ getsb(fs, file)
void void
putsb(fs, file, all) putsb(fs, file, all)
register struct fs *fs; struct fs *fs;
char *file; const char *file;
int all; int all;
{ {
int i; int i;
@ -389,11 +391,11 @@ putsb(fs, file, all)
close(i); close(i);
if (fi < 0) if (fi < 0)
err(3, "cannot open %s", file); err(3, "cannot open %s", file);
bwrite((daddr_t)SBOFF / dev_bsize, (char *)fs, SBSIZE); bwrite((daddr_t)SBOFF / dev_bsize, (const char *)fs, SBSIZE);
if (all) if (all)
for (i = 0; i < fs->fs_ncg; i++) for (i = 0; i < fs->fs_ncg; i++)
bwrite(fsbtodb(fs, cgsblock(fs, i)), bwrite(fsbtodb(fs, cgsblock(fs, i)),
(char *)fs, SBSIZE); (const char *)fs, SBSIZE);
close(fi); close(fi);
} }
@ -427,7 +429,7 @@ printfs()
void void
bwrite(blk, buf, size) bwrite(blk, buf, size)
daddr_t blk; daddr_t blk;
char *buf; const char *buf;
int size; int size;
{ {