X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=support%2Fnfs%2Ffstab.c;h=b4f8710ba2d3a5c75f286af4ee0c7320a17009ea;hp=ba72a53418973e995f56dbf4a031aac939378496;hb=8414d150cee62ba0554cfd645956a88dba02a7eb;hpb=eeaf5bfbfe2b2a98de3c40b1c44c3f8e15102633

diff --git a/support/nfs/fstab.c b/support/nfs/fstab.c
index ba72a53..b4f8710 100644
--- a/support/nfs/fstab.c
+++ b/support/nfs/fstab.c
@@ -87,20 +87,21 @@ static void read_mounttable(void);
 static void read_fstab(void);
 
 static struct mntentchn *
-mtab_head() {
+mtab_head(void) {
 	if (!got_mtab)
 		read_mounttable();
 	return &mounttable;
 }
 
 static struct mntentchn *
-fstab_head()
+fstab_head(void)
 {
 	if (!got_fstab)
 		read_fstab();
 	return &fstab;
 }
 
+#if 0
 static void
 my_free(const void *s) {
 	if (s)
@@ -120,6 +121,7 @@ discard_mntentchn(struct mntentchn *mc0) {
 		free(mc);
 	}
 }
+#endif
 
 static void
 read_mntentchn(mntFILE *mfp, const char *fnam, struct mntentchn *mc0) {
@@ -444,7 +446,8 @@ lock_mtab (void) {
  */
 
 void
-update_mtab (const char *dir, struct mntent *instead) {
+update_mtab (const char *dir, struct mntent *instead)
+{
 	mntFILE *mfp, *mftmp;
 	const char *fnam = MOUNTED;
 	struct mntentchn mtabhead;	/* dummy */
@@ -513,8 +516,14 @@ update_mtab (const char *dir, struct mntent *instead) {
 		}
 	}
 
+#if 0
+	/* the chain might have strings copied from 'instead',
+	 * so we cannot safely free it.
+	 * And there is no need anyway because we are going to exit
+	 * shortly.  So just don't call discard_mntentchn....
+	 */
 	discard_mntentchn(mc0);
-
+#endif
 	if (fchmod (fileno (mftmp->mntent_fp),
 		    S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH) < 0) {
 		int errsv = errno;