diff options
author | mdodd <mdodd@FreeBSD.org> | 2003-04-07 11:34:12 +0000 |
---|---|---|
committer | mdodd <mdodd@FreeBSD.org> | 2003-04-07 11:34:12 +0000 |
commit | 02e573828b4bdc4258068030d62ff93e965536a9 (patch) | |
tree | 7ac5258f69aa411caafd804cdfb9b7b2c9a2e071 | |
parent | 16a93d5f11db01cd997e9319c951f5ef5a10caea (diff) | |
download | FreeBSD-src-02e573828b4bdc4258068030d62ff93e965536a9.zip FreeBSD-src-02e573828b4bdc4258068030d62ff93e965536a9.tar.gz |
Avoid a name conflict with future functionality:
getfstab() -> dump_getfstab()
-rw-r--r-- | sbin/dump/dump.h | 2 | ||||
-rw-r--r-- | sbin/dump/main.c | 2 | ||||
-rw-r--r-- | sbin/dump/optr.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/sbin/dump/dump.h b/sbin/dump/dump.h index feb5913..9af02d0 100644 --- a/sbin/dump/dump.h +++ b/sbin/dump/dump.h @@ -125,7 +125,7 @@ void writerec(char *dp, int isspcl); void Exit(int status) __dead2; void dumpabort(int signo); -void getfstab(void); +void dump_getfstab(void); char *rawname(char *cp); union dinode *getino(ino_t inum, int *mode); diff --git a/sbin/dump/main.c b/sbin/dump/main.c index b540383..9b3db78 100644 --- a/sbin/dump/main.c +++ b/sbin/dump/main.c @@ -304,7 +304,7 @@ main(int argc, char *argv[]) if (signal(SIGINT, interrupt) == SIG_IGN) signal(SIGINT, SIG_IGN); - getfstab(); /* /etc/fstab snarfed */ + dump_getfstab(); /* /etc/fstab snarfed */ /* * disk can be either the full special file name, * the suffix of the special file name, diff --git a/sbin/dump/optr.c b/sbin/dump/optr.c index 09333c8..bc00b1a 100644 --- a/sbin/dump/optr.c +++ b/sbin/dump/optr.c @@ -295,7 +295,7 @@ struct pfstab { static SLIST_HEAD(, pfstab) table; void -getfstab(void) +dump_getfstab(void) { struct fstab *fs; struct pfstab *pf; @@ -367,7 +367,7 @@ lastdump(int arg) /* w ==> just what to do; W ==> most recent dumps */ struct tm *tlast; (void) time(&tnow); - getfstab(); /* /etc/fstab input */ + dump_getfstab(); /* /etc/fstab input */ initdumptimes(); /* /etc/dumpdates input */ qsort((char *) ddatev, nddates, sizeof(struct dumpdates *), datesort); |