From a3165d16afb925f7a5b8e7404d4669e61bfb3728 Mon Sep 17 00:00:00 2001
From: "Matthew N. Dodd" <mdodd@FreeBSD.org>
Date: Mon, 7 Apr 2003 11:34:12 +0000
Subject: [PATCH] Avoid a name conflict with future functionality:

	getfstab() -> dump_getfstab()
---
 sbin/dump/dump.h | 2 +-
 sbin/dump/main.c | 2 +-
 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 feb59134eb48..9af02d0c3a97 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 b540383baf78..9b3db786961f 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 09333c88d10f..bc00b1ab1780 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);