d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove __P() and register.

Browse Source 
Set WARNS=2

This is the beginning of a pre-UFS2 cleanup of newfs.

Sponsored by:	DARPA, NAI Labs
This commit is contained in:
Poul-Henning Kamp 2002-03-17 09:01:41 +00:00
parent be746f1805
commit 345b78a301
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=92483
3 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sbin/newfs/Makefile
View File

@ -7,7 +7,7 @@ MAN= newfs.8
MOUNT= ${.CURDIR}/../mount MOUNT= ${.CURDIR}/../mount
CFLAGS+=-DFSIRAND -I${MOUNT} CFLAGS+=-DFSIRAND -I${MOUNT}
WARNS= 0 WARNS= 2
.PATH: ${MOUNT} .PATH: ${MOUNT}

48
sbin/newfs/mkfs.c
View File

@ -61,13 +61,13 @@ static const char rcsid[] =
#ifndef STANDALONE #ifndef STANDALONE
#include <stdlib.h> #include <stdlib.h>
#else #else
extern int atoi __P((char *)); extern int atoi (char *);
extern char * getenv __P((char *)); extern char * getenv (char *);
#endif #endif
#ifdef FSIRAND #ifdef FSIRAND
extern long random __P((void)); extern long random (void);
extern void srandomdev __P((void)); extern void srandomdev (void);
#endif #endif
/* /*
@ -144,23 +144,23 @@ int randinit;
daddr_t alloc(); daddr_t alloc();
long calcipg(); long calcipg();
static int charsperline(); static int charsperline();
void clrblock __P((struct fs *, unsigned char *, int)); void clrblock (struct fs *, unsigned char *, int);
void fsinit __P((time_t)); void fsinit (time_t);
void initcg __P((int, time_t)); void initcg (int, time_t);
int isblock __P((struct fs *, unsigned char *, int)); int isblock (struct fs *, unsigned char *, int);
void iput __P((struct dinode *, ino_t)); void iput (struct dinode *, ino_t);
int makedir __P((struct direct *, int)); int makedir (struct direct *, int);
void rdfs __P((daddr_t, int, char *)); void rdfs (daddr_t, int, char *);
void setblock __P((struct fs *, unsigned char *, int)); void setblock (struct fs *, unsigned char *, int);
void wtfs __P((daddr_t, int, char *)); void wtfs (daddr_t, int, char *);
void wtfsflush __P((void)); void wtfsflush (void);
#ifndef STANDALONE #ifndef STANDALONE
#else #else
void free __P((char *)); void free (char *);
char * calloc __P((u_long, u_long)); char * calloc (u_long, u_long);
caddr_t malloc __P((u_long)); caddr_t malloc (u_long);
caddr_t realloc __P((char *, u_long)); caddr_t realloc (char *, u_long);
#endif #endif
void void
@ -169,7 +169,7 @@ mkfs(pp, fsys, fi, fo)
char *fsys; char *fsys;
int fi, fo; int fi, fo;
{ {
register long i, mincpc, mincpg, inospercg; long i, mincpc, mincpg, inospercg;
long cylno, rpos, blk, j, warn = 0; long cylno, rpos, blk, j, warn = 0;
long used, mincpgcnt, bpcg; long used, mincpgcnt, bpcg;
off_t usedb; off_t usedb;
@ -699,7 +699,7 @@ initcg(cylno, utime)
{ {
daddr_t cbase, d, dlower, dupper, dmax, blkno; daddr_t cbase, d, dlower, dupper, dmax, blkno;
long i; long i;
register struct csum *cs; struct csum *cs;
#ifdef FSIRAND #ifdef FSIRAND
long j; long j;
#endif #endif
@ -951,7 +951,7 @@ fsinit(utime)
*/ */
int int
makedir(protodir, entries) makedir(protodir, entries)
register struct direct *protodir; struct direct *protodir;
int entries; int entries;
{ {
char *cp; char *cp;
@ -1066,8 +1066,8 @@ calcipg(cpg, bpcg, usedbp)
*/ */
void void
iput(ip, ino) iput(ip, ino)
register struct dinode *ip; struct dinode *ip;
register ino_t ino; ino_t ino;
{ {
struct dinode buf[MAXINOPB]; struct dinode buf[MAXINOPB];
daddr_t d; daddr_t d;
@ -1105,7 +1105,7 @@ iput(ip, ino)
*/ */
caddr_t caddr_t
malloc(size) malloc(size)
register u_long size; u_long size;
{ {
char *base, *i; char *base, *i;
static u_long pgsz; static u_long pgsz;

14
sbin/newfs/newfs.c
View File

@ -205,18 +205,18 @@ int unlabeled;
char device[MAXPATHLEN]; char device[MAXPATHLEN];
char *progname; char *progname;
extern void mkfs __P((struct partition *, char *, int, int)); extern void mkfs (struct partition *, char *, int, int);
static void usage __P((void)); static void usage (void);
static void rewritelabel __P((char *s, int fd, register struct disklabel *lp)); static void rewritelabel (char *s, int fd, register struct disklabel *lp);
int int
main(argc, argv) main(argc, argv)
int argc; int argc;
char *argv[]; char *argv[];
{ {
register int ch; int ch;
register struct partition *pp; struct partition *pp;
register struct disklabel *lp; struct disklabel *lp;
struct disklabel *getdisklabel(); struct disklabel *getdisklabel();
struct partition oldpartition; struct partition oldpartition;
struct stat st; struct stat st;
@ -578,7 +578,7 @@ void
rewritelabel(s, fd, lp) rewritelabel(s, fd, lp)
char *s; char *s;
int fd; int fd;
register struct disklabel *lp; struct disklabel *lp;
{ {
#ifdef COMPAT #ifdef COMPAT
if (unlabeled) if (unlabeled)