[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs Makefile.am, 1.58, 1.59 utils.c, 1.63, 1.64 utils.h, 1.35, 1.36

[Yura P. <yu...@de...>]

Changes by: yura

Update of /cvs/linux-ntfs/ntfsprogs/ntfsprogs
In directory delta357.server4you.de:/tmp/cvs-serv3555/ntfsprogs

Modified Files:
	Makefile.am utils.c utils.h 
Log Message:
prepare to Szaka's code merge: remove not working Rich's index code


Index: Makefile.am
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/Makefile.am,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- Makefile.am	11 Apr 2006 22:47:22 -0000	1.58
+++ Makefile.am	17 Jul 2006 11:49:52 -0000	1.59
@@ -37,10 +37,6 @@ if ENABLE_CRYPTO
 EXTRA_PROGRAMS		+= ntfsdecrypt
 endif
 
-if ENABLE_RICH
-EXTRA_PROGRAMS		+= ntfsrm
-endif
-
 # Set the include path.
 AM_CPPFLAGS		= -I$(top_srcdir)/include/ntfs $(all_includes)
 
@@ -101,12 +97,6 @@ ntfscmp_LDFLAGS		= $(AM_LFLAGS)
 
 # We don't distribute these
 
-if ENABLE_RICH
-ntfsrm_SOURCES		= ntfsrm.c ntfsrm.h utils.c utils.h
-ntfsrm_LDADD		= $(AM_LIBS)
-ntfsrm_LDFLAGS		= $(AM_LFLAGS)
-endif
-
 ntfstruncate_SOURCES	= attrdef.c ntfstruncate.c utils.c utils.h
 ntfstruncate_LDADD	= $(AM_LIBS)
 ntfstruncate_LDFLAGS	= $(AM_LFLAGS)

Index: utils.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/utils.c,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- utils.c	27 Mar 2006 22:49:52 -0000	1.63
+++ utils.c	17 Jul 2006 11:49:52 -0000	1.64
@@ -98,7 +98,6 @@ int utils_set_locale(void)
 	}
 }
 
-#ifndef NTFS_RICH
 /**
  * utils_valid_device - Perform some safety checks on the device, before we start
  * @name:   Full pathname of the device/file to work with
@@ -210,8 +209,6 @@ ntfs_volume * utils_mount_volume(const c
 	return vol;
 }
 
-#endif
-
 /**
  * utils_parse_size - Convert a string representing a size
  * @value:  String to be parsed
@@ -333,7 +330,6 @@ int utils_parse_range(const char *string
 	return 1;
 }
 
-#ifndef NTFS_RICH
 /**
  * find_attribute - Find an attribute of the given type
  * @type:  An attribute type, e.g. AT_FILE_NAME
@@ -403,7 +399,6 @@ ATTR_RECORD * find_first_attribute(const
 	return rec;
 }
 
-#endif
 /**
  * utils_inode_get_name
  *

Index: utils.h
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/utils.h,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- utils.h	27 Nov 2005 12:35:29 -0000	1.35
+++ utils.h	17 Jul 2006 11:49:52 -0000	1.36
@@ -52,15 +52,11 @@ int utils_mftrec_in_use(ntfs_volume *vol
 int utils_is_metadata(ntfs_inode *inode);
 void utils_dump_mem(void *buf, int start, int length, int flags);
 
-#ifndef _NTFS_RICH_H_
 ATTR_RECORD * find_attribute(const ATTR_TYPES type, ntfs_attr_search_ctx *ctx);
 ATTR_RECORD * find_first_attribute(const ATTR_TYPES type, MFT_RECORD *mft);
-#endif
 
-#if !(defined(_NTFS_VOLUME_H) && defined(NTFS_RICH))
 int utils_valid_device(const char *name, int force);
 ntfs_volume * utils_mount_volume(const char *device, unsigned long flags, BOOL force);
-#endif
 
 /**
  * defines...