* vfs.c (vfs_flags): Eliminate, it's never assigned a non-zero

value.
* vfs.h: Eliminate unused VFS flags.
* local.c (vfs_nil_ops): Eliminate, it's unused now.

vfs/ChangeLog

@@ -1,5 +1,10 @@
 2003-10-10  Pavel Roskin  <proski@gnu.org>
 
+	* vfs.c (vfs_flags): Eliminate, it's never assigned a non-zero
+	value.
+	* vfs.h: Eliminate unused VFS flags.
+	* local.c (vfs_nil_ops): Eliminate, it's unused now.
+
 	* fish.c: Convert to calling vfs_register_class().
 	* fish.h: Eliminate.  Adjust all dependencies.
 	* direntry.c (vfs_s_init_class): Add missing vfs_s_setctl().

vfs/local.c

@@ -362,63 +362,3 @@ vfs vfs_local_ops = {
     local_munmap
 #endif
 };
-
-vfs vfs_nil_ops = {
-    NULL,	/* This is place of next pointer */
-    "nullfs",
-    0,		/* flags */
-    NULL,	/* prefix */
-    NULL,	/* data */
-    0,		/* errno */
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-
-    NULL,
-    NULL,
-    NULL,
-
-    NULL,
-    NULL,
-    NULL,
-
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    
-    local_getid,
-    local_nothingisopen,
-    local_free,
-    
-    NULL,
-    NULL,
-    
-    NULL,
-    NULL,
-    
-    NULL,
-    NULL
-#ifdef HAVE_MMAP
-    , NULL,
-    NULL
-#endif
-};

vfs/vfs.c

@@ -55,7 +55,6 @@
 #endif
 
 int vfs_timeout = 60; /* VFS timeout in seconds */
-static int vfs_flags = 0;    /* Flags */
 
 /* They keep track of the current directory */
 static vfs *current_vfs = &vfs_local_ops;
@@ -169,9 +168,6 @@ path_magic (const char *path)
 {
     struct stat buf;
 
-    if (vfs_flags & FL_ALWAYS_MAGIC)
-        return 1;
-
     if (!stat(path, &buf))
         return 0;
 
@@ -244,8 +240,6 @@ vfs_rosplit (char *path)
 	*slash = 0;
     
     ret = vfs_type_from_op (semi+1);
-    if (!ret && (vfs_flags & FL_NO_LOCALHASH))
-	return &vfs_nil_ops;
 
     if (slash)
 	*slash = PATH_SEP;
@@ -637,8 +631,7 @@ static void
 vfs_setup_wd (void)
 {
     current_dir = g_strdup (PATH_SEP_STR);
-    if (!(vfs_flags & FL_NO_CWDSETUP))
-	_vfs_get_cwd ();
+    _vfs_get_cwd ();
 
     if (strlen (current_dir) > MC_MAXPATHLEN - 2)
 	vfs_die ("Current dir too long.\n");

vfs/vfs.h

@@ -111,7 +111,6 @@
     void init_fish (void);
 
     extern vfs vfs_local_ops;
-    extern vfs vfs_nil_ops;
     extern vfs vfs_tarfs_ops;
     extern vfs vfs_ftpfs_ops;
     extern vfs vfs_smbfs_ops;
@@ -335,19 +334,6 @@ extern void vfs_print_stats (const char *fs_name, const char *action,
 #define MCCTL_WANT_STALE_DATA	9
 #define MCCTL_NO_STALE_DATA    10
 
-#define FL_ALWAYS_MAGIC 1
-#define FL_NO_MCFS 2
-#define FL_NO_FTPFS 4
-#define FL_NO_UNDELFS 8
-#define FL_NO_TARFS 16
-#define FL_NO_EXTFS 32
-#define FL_NO_SFS 64
-#define FL_NO_FISH 128
-
-#define FL_NO_LOCALHASH 0x20000000	/* When you never ever want vfs to work with regular files with # in name */
-#define FL_NO_CWDSETUP	0x40000000
-
-
 #define O_ALL (O_CREAT | O_EXCL | O_NOCTTY | O_NDELAY | O_SYNC | O_WRONLY | O_RDWR | O_RDONLY)
 /* Midnight commander code should _not_ use other flags than those
    listed above and O_APPEND */