From b7efdfa380f79333e2cda59dd828169783d3bb0e Mon Sep 17 00:00:00 2001
From: Pavel Roskin <proski@gnu.org>
Date: Thu, 16 Oct 2003 05:06:24 +0000
Subject: [PATCH] * xdirentry.h: Remove magic numbers.  Move some constants ...
 * ftpfs.c: ... here.

---
 vfs/ChangeLog   |  5 +++++
 vfs/ftpfs.c     |  4 ++++
 vfs/xdirentry.h | 11 -----------
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/vfs/ChangeLog b/vfs/ChangeLog
index 4a49ad8d6..1edee26d2 100644
--- a/vfs/ChangeLog
+++ b/vfs/ChangeLog
@@ -1,3 +1,8 @@
+2003-10-16  Pavel Roskin  <proski@gnu.org>
+
+	* xdirentry.h: Remove magic numbers.  Move some constants ...
+	* ftpfs.c: ... here.
+
 2003-10-15  Pavel Roskin  <proski@gnu.org>
 
 	* samba/lib/doscalls.c: Remove.  Remove all references to it.
diff --git a/vfs/ftpfs.c b/vfs/ftpfs.c
index 79225f0f6..f4e2d3130 100644
--- a/vfs/ftpfs.c
+++ b/vfs/ftpfs.c
@@ -89,6 +89,10 @@ What to do with this?
 #define INADDR_NONE 0xffffffff
 #endif
 
+#define RFC_AUTODETECT 0
+#define RFC_DARING 1
+#define RFC_STRICT 2
+
 
 static int my_errno;
 static int code;
diff --git a/vfs/xdirentry.h b/vfs/xdirentry.h
index 8e296dbab..059024abd 100644
--- a/vfs/xdirentry.h
+++ b/vfs/xdirentry.h
@@ -37,8 +37,6 @@ struct vfs_s_entry {
     struct vfs_s_inode *dir;	/* Directory we are in - needed for invalidating directory when file in it changes */
     char *name;			/* Name of this entry */
     struct vfs_s_inode *ino;	/* ... and its inode */
-/*  int magic; */
-#define ENTRY_MAGIC 0x014512563
 };
 
 struct vfs_s_inode {
@@ -66,8 +64,6 @@ struct vfs_s_inode {
 	    struct timeval timestamp;
 	} ftp;
     } u;
-/*  int magic; */
-#define INODE_MAGIC 0x93451656
 };
 
 struct vfs_s_super {
@@ -110,9 +106,6 @@ struct vfs_s_super {
 				   "LIST -la <path>"; use "CWD <path>"/
 				   "LIST" instead */
 	    int control_connection_buzy;
-#define RFC_AUTODETECT 0
-#define RFC_DARING 1
-#define RFC_STRICT 2
 	} ftp;
 	struct {
 	    int fd;
@@ -122,8 +115,6 @@ struct vfs_s_super {
 	    struct defer_inode *defered;	/* List of inodes for which another entries may appear */
 	} cpio;
     } u;
-/*  int magic; */
-#define SUPER_MAGIC 0x915ac312
 };
 
 struct vfs_s_fh {
@@ -140,8 +131,6 @@ struct vfs_s_fh {
 	    int sock, append;
 	} ftp;
     } u;
-/*  int magic; */
-#define FH_MAGIC 0x91324682
 };
 
 struct vfs_s_data {