[Linux-NTFS-cvs] CVS: linux-ntfs/include Makefile.am,1.10,1.11 Makefile.in,1.15,1.16 attrib.h,1.30,1.31 debug.h,1.3,1.4 volume.h,1.17,1.18 attrib_RE.h,1.1,NONE

[Anton A. <an...@us...>]

Changes by: antona

Update of /cvsroot/linux-ntfs/linux-ntfs/include
In directory usw-pr-cvs1:/tmp/cvs-serv15593/include

Modified Files:
	Makefile.am Makefile.in attrib.h debug.h volume.h 
Removed Files:
	attrib_RE.h 
Log Message:
Attribute list support (merging done, part 2, some stuff still incomplete). mkntfs ntfs volume creation. See the changelog...


Index: Makefile.am
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/Makefile.am,v
retrieving revision 1.10
retrieving revision 1.11
diff -U2 -r1.10 -r1.11
--- Makefile.am	19 Apr 2002 18:23:56 -0000	1.10
+++ Makefile.am	22 Apr 2002 10:34:31 -0000	1.11
@@ -9,23 +9,19 @@
 linux_ntfsincludedir = $(includedir)/ntfs
 linux_ntfsinclude_HEADERS = \
-	attrib.h \
-	bitmap.h \
-	bootsect.h \
-	disk_io.h \
-	endians.h \
-	logfile.h \
-	mft.h \
-	mst.h \
-	volume.h \
-	unistr.h \
-	support.h \
-	layout.h \
-	types.h \
-	list.h \
-	debug.h \
-	inode.h
-
-# Don't need these distributed.
-#EXTRA_DIST = \
-#	attrib_RE.h
+	attrib.h	\
+	bitmap.h	\
+	bootsect.h	\
+	debug.h		\
+	disk_io.h	\
+	endians.h	\
+	inode.h		\
+	layout.h	\
+	list.h		\
+	logfile.h	\
+	mft.h		\
+	mst.h		\
+	support.h	\
+	types.h		\
+	unistr.h	\
+	volume.h
 

Index: Makefile.in
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/Makefile.in,v
retrieving revision 1.15
retrieving revision 1.16
diff -U2 -r1.15 -r1.16
--- Makefile.in	19 Apr 2002 18:23:56 -0000	1.15
+++ Makefile.in	22 Apr 2002 10:34:31 -0000	1.16
@@ -94,20 +94,20 @@
 linux_ntfsincludedir = $(includedir)/ntfs
 linux_ntfsinclude_HEADERS = \
-	attrib.h \
-	bitmap.h \
-	bootsect.h \
-	disk_io.h \
-	endians.h \
-	logfile.h \
-	mft.h \
-	mst.h \
-	volume.h \
-	unistr.h \
-	support.h \
-	layout.h \
-	types.h \
-	list.h \
-	debug.h \
-	inode.h
+	attrib.h	\
+	bitmap.h	\
+	bootsect.h	\
+	debug.h		\
+	disk_io.h	\
+	endians.h	\
+	inode.h		\
+	layout.h	\
+	list.h		\
+	logfile.h	\
+	mft.h		\
+	mst.h		\
+	support.h	\
+	types.h		\
+	unistr.h	\
+	volume.h
 
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -262,8 +262,4 @@
 mostlyclean distclean maintainer-clean
 
-
-# Don't need these distributed.
-#EXTRA_DIST = \
-#	attrib_RE.h
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.

Index: attrib.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/attrib.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -U2 -r1.30 -r1.31
--- attrib.h	20 Apr 2002 23:09:42 -0000	1.30
+++ attrib.h	22 Apr 2002 10:34:31 -0000	1.31
@@ -76,15 +76,6 @@
 		ntfs_attr_search_ctx *ctx);
 
-/**
- * decompress_run_list - decompress a mapping pairs array into a run list
- * @attr:	non-resident attribute whose mapping pairs array to decompress
- * 
- * Allocate a run_list array and decompress the run-list of the non-resident
- * attribute @attr into the run_list array.
- * 
- * Return a pointer to the run_list array or NULL on error.
- * Notes: caller has to free the run_list array when finished.
- */
-run_list *decompress_run_list(const ATTR_RECORD *attr);
+extern run_list_element *ntfs_decompress_mapping_pairs(const ntfs_volume *vol,
+		const ATTR_RECORD *attr, run_list_element *old_rl);
 
 /**

Index: debug.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/debug.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -U2 -r1.3 -r1.4
--- debug.h	15 Apr 2002 20:04:25 -0000	1.3
+++ debug.h	22 Apr 2002 10:34:31 -0000	1.4
@@ -25,4 +25,6 @@
 #define DEBUG_H
 
+#include "attrib.h"
+
 #ifdef DEBUG
 
@@ -64,20 +66,12 @@
 }
 
-#else
+extern void ntfs_debug_dump_run_list(const run_list_element *rl);
 
-static __inline__ void Dprintf(const char *fmt, ...)
-{
-	return;
-}
-
-static __inline__ void Dputs(const char *s)
-{
-	return;
-}
+#else
 
-static __inline__ void Dperror(const char *s)
-{
-	return;
-}
+static __inline__ void Dprintf(const char *fmt, ...) {}
+static __inline__ void Dputs(const char *s) {}
+static __inline__ void Dperror(const char *s) {}
+static __inline__ void ntfs_debug_dump_run_list(const run_list_element *rl) {}
 
 #endif

Index: volume.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/volume.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -U2 -r1.17 -r1.18
--- volume.h	20 Apr 2002 23:09:42 -0000	1.17
+++ volume.h	22 Apr 2002 10:34:31 -0000	1.18
@@ -58,5 +58,5 @@
 				   but except that it keeps track of the usage
 				   of the mft records rather than the lcns. */
-	run_list *mft_runlist;	/* Decompressed run list of the data attribute
+	run_list *mft_rl;	/* Decompressed run list of the data attribute
 				   of FILE_Mft. */
 	__s64 number_of_mft_records;	/* Number of records in the mft, equals

--- attrib_RE.h DELETED ---