diff options
author | imp <imp@FreeBSD.org> | 2002-03-20 22:49:40 +0000 |
---|---|---|
committer | imp <imp@FreeBSD.org> | 2002-03-20 22:49:40 +0000 |
commit | 69763106f0fd2b6bc5d1d93ba49d88ca38ea3c56 (patch) | |
tree | 07ff12515683ef4e24a284e242c874bd8b92d427 /sbin/dump/dump.h | |
parent | 2e58ec02712d7b8dffd130dacaad2ad7c24c592b (diff) | |
download | FreeBSD-src-69763106f0fd2b6bc5d1d93ba49d88ca38ea3c56.zip FreeBSD-src-69763106f0fd2b6bc5d1d93ba49d88ca38ea3c56.tar.gz |
o remove __P
o Use ANSI function definitions
o unifdef -D__STDC__
Diffstat (limited to 'sbin/dump/dump.h')
-rw-r--r-- | sbin/dump/dump.h | 92 |
1 files changed, 38 insertions, 54 deletions
diff --git a/sbin/dump/dump.h b/sbin/dump/dump.h index e3cc7c2..f9a7234 100644 --- a/sbin/dump/dump.h +++ b/sbin/dump/dump.h @@ -90,58 +90,54 @@ long dev_bsize; /* block size of underlying disk device */ int dev_bshift; /* log2(dev_bsize) */ int tp_bshift; /* log2(TP_BSIZE) */ -#ifndef __P -#include <sys/cdefs.h> -#endif - /* operator interface functions */ -void broadcast __P((char *message)); -void infosch __P((int)); -void lastdump __P((int arg)); /* int should be char */ -void msg __P((const char *fmt, ...)) __printflike(1, 2); -void msgtail __P((const char *fmt, ...)) __printflike(1, 2); -int query __P((char *question)); -void quit __P((const char *fmt, ...)) __printflike(1, 2); -void timeest __P((void)); -time_t unctime __P((char *str)); +void broadcast(const char *message); +void infosch(int); +void lastdump(int arg); /* int should be char */ +void msg(const char *fmt, ...) __printflike(1, 2); +void msgtail(const char *fmt, ...) __printflike(1, 2); +int query(const char *question); +void quit(const char *fmt, ...) __printflike(1, 2); +void timeest(void); +time_t unctime(char *str); /* mapping rouintes */ struct dinode; -long blockest __P((struct dinode *dp)); -int mapfiles __P((ino_t maxino, long *tapesize)); -int mapdirs __P((ino_t maxino, long *tapesize)); +long blockest(struct dinode *dp); +int mapfiles(ino_t maxino, long *tapesize); +int mapdirs(ino_t maxino, long *tapesize); /* file dumping routines */ -void blksout __P((daddr_t *blkp, int frags, ino_t ino)); -void bread __P((daddr_t blkno, char *buf, int size)); -void dumpino __P((struct dinode *dp, ino_t ino)); -void dumpmap __P((char *map, int type, ino_t ino)); -void writeheader __P((ino_t ino)); +void blksout(daddr_t *blkp, int frags, ino_t ino); +void bread(daddr_t blkno, char *buf, int size); +void dumpino(struct dinode *dp, ino_t ino); +void dumpmap(char *map, int type, ino_t ino); +void writeheader(ino_t ino); /* tape writing routines */ -int alloctape __P((void)); -void close_rewind __P((void)); -void dumpblock __P((daddr_t blkno, int size)); -void startnewtape __P((int top)); -void trewind __P((void)); -void writerec __P((char *dp, int isspcl)); +int alloctape(void); +void close_rewind(void); +void dumpblock(daddr_t blkno, int size); +void startnewtape(int top); +void trewind(void); +void writerec(char *dp, int isspcl); -void Exit __P((int status)) __dead2; -void dumpabort __P((int signo)); -void getfstab __P((void)); +void Exit(int status) __dead2; +void dumpabort(int signo); +void getfstab(void); -char *rawname __P((char *cp)); -struct dinode *getino __P((ino_t inum)); +char *rawname(char *cp); +struct dinode *getino(ino_t inum); /* rdump routines */ #ifdef RDUMP -void rmtclose __P((void)); -int rmthost __P((char *host)); -int rmtopen __P((char *tape, int mode)); -int rmtwrite __P((char *buf, int count)); +void rmtclose(void); +int rmthost(const char *host); +int rmtopen(const char *tape, int mode); +int rmtwrite(const char *buf, int count); #endif /* RDUMP */ -void interrupt __P((int signo)); /* in case operator bangs on console */ +void interrupt(int signo); /* in case operator bangs on console */ /* * Exit status codes @@ -153,7 +149,7 @@ void interrupt __P((int signo)); /* in case operator bangs on console */ #define OPGRENT "operator" /* group entry to notify */ -struct fstab *fstabsearch __P((char *key)); /* search fs_file and fs_spec */ +struct fstab *fstabsearch(const char *key); /* search fs_file and fs_spec */ #ifndef NAME_MAX #define NAME_MAX 255 @@ -171,25 +167,13 @@ struct dumpdates { int nddates; /* number of records (might be zero) */ int ddates_in; /* we have read the increment file */ struct dumpdates **ddatev; /* the arrayfied version */ -void initdumptimes __P((void)); -void getdumptime __P((void)); -void putdumptime __P((void)); +void initdumptimes(void); +void getdumptime(void); +void putdumptime(void); #define ITITERATE(i, ddp) \ for (ddp = ddatev[i = 0]; i < nddates; ddp = ddatev[++i]) -void sig __P((int signo)); - -/* - * Compatibility with old systems. - */ -#ifdef COMPAT -#include <sys/file.h> -#define strchr(a,b) index(a,b) -#define strrchr(a,b) rindex(a,b) -extern char *strdup(), *ctime(); -extern int read(), write(); -extern int errno; -#endif +void sig(int signo); #ifndef _PATH_UTMP #define _PATH_UTMP "/etc/utmp" |