From c0d6dec814a476c1760c9c6ac1f43fb5d27ae9d0 Mon Sep 17 00:00:00 2001
From: Pavel Roskin <proski@gnu.org>
Date: Thu, 1 Aug 2002 19:48:21 +0000
Subject: [PATCH] * mcserv.c: Remove all references to MAD. * vfs.c: Likewise.

---
 vfs/ChangeLog |  7 ++++++-
 vfs/mcserv.c  | 10 ----------
 vfs/vfs.c     |  4 ----
 3 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/vfs/ChangeLog b/vfs/ChangeLog
index 0f7d3018d..7e5affe33 100644
--- a/vfs/ChangeLog
+++ b/vfs/ChangeLog
@@ -1,6 +1,11 @@
+2002-08-01  Pavel Roskin  <proski@gnu.org>
+
+	* mcserv.c: Remove all references to MAD.
+	* vfs.c: Likewise.
+
 2002-07-31  Andrew V. Samoilov  <kai@cmail.ru>
 
-	* samba/libsmb/clientgen.c (cli_send_tconX): Add missed 
+	* samba/libsmb/clientgen.c (cli_send_tconX): Add missing
 	unix_to_dos() call.
 	(cli_printjob_del): Commented out.
 	(cli_print_queue): Ditto.
diff --git a/vfs/mcserv.c b/vfs/mcserv.c
index 62bf8bb13..69b2df99b 100644
--- a/vfs/mcserv.c
+++ b/vfs/mcserv.c
@@ -1225,9 +1225,6 @@ int main (int argc, char *argv [])
     extern char *optarg;
     int c;
 
-#ifdef HAVE_MAD
-    mad_init ();
-#endif
     while ((c = getopt (argc, argv, "fdiqp:v")) != -1){
 	switch (c){
 	case 'd':
@@ -1291,9 +1288,6 @@ int main (int argc, char *argv [])
 	    pmap_unset (RPC_PROGNUM, RPC_PROGVER);
 #endif
     }
-#ifdef HAVE_MAD
-    mad_finalize (__FILE__, __LINE__);
-#endif
     exit (return_code);
 }
 
@@ -1304,7 +1298,3 @@ void vfs_die( char *m )
     exit (1);
 }
 
-/* Here to avoid undefining of malloc and family */
-#ifdef HAVE_MAD
-#include "../src/mad.c"
-#endif
diff --git a/vfs/vfs.c b/vfs/vfs.c
index 9af318fd5..4a43580c2 100644
--- a/vfs/vfs.c
+++ b/vfs/vfs.c
@@ -755,11 +755,7 @@ vfs_canon (const char *path)
      */
     {
 	char *result = g_strdup (path);
-        
-	mad_check("(pre-canonicalize)", 0);
 	canonicalize_pathname (result);
-	mad_check("(post-canonicalize)", 0);
-
         return result;
     }
 }