[Linux-NTFS-cvs] CVS: ntfsprogs/include/ntfs collate.h,1.4,1.5

[Yuval <uv...@de...>]

Changes by: uvman

Update of /cvs/linux-ntfs/ntfsprogs/include/ntfs
In directory delta357:/tmp/cvs-serv16462/include/ntfs

Modified Files:
	collate.h 
Log Message:
Change ntfs_collate()'s signature to size_t's. Move ntfs_is_collation_rule_supported to the .c file and rewrite it to be shorter.

Index: collate.h
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/include/ntfs/collate.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- collate.h	31 Oct 2005 01:15:12 -0000	1.4
+++ collate.h	29 Oct 2006 00:01:17 -0000	1.5
@@ -27,37 +27,12 @@
 #include "types.h"
 #include "volume.h"
 
-#define NTFS_COLLATION_ERROR -2
+#define NTFS_COLLATION_ERROR (-2)
 
-/**
- * ntfs_is_collation_rule_supported -
- * @cr:
- *
- * Description...
- *
- * Returns:
- */
-static inline BOOL ntfs_is_collation_rule_supported(COLLATION_RULES cr)
-{
-	int i;
-
-	/*
-	 * FIXME:  At the moment we only support COLLATION_BINARY,
-	 * COLLATION_NTOFS_ULONG and COLLATION_FILE_NAME so we return false
-	 * for everything else.
-	 */
-	if (cr != COLLATION_BINARY && cr != COLLATION_NTOFS_ULONG &&
-			cr != COLLATION_FILE_NAME)
-		return FALSE;
-	i = le32_to_cpu(cr);
-	if (((i >= 0) && (i <= 0x02)) ||
-			((i >= 0x10) && (i <= 0x13)))
-		return TRUE;
-	return FALSE;
-}
+extern BOOL ntfs_is_collation_rule_supported(COLLATION_RULES cr);
 
 extern int ntfs_collate(ntfs_volume *vol, COLLATION_RULES cr,
-		const void *data1, const int data1_len,
-		const void *data2, const int data2_len);
+		const void *data1, size_t data1_len,
+		const void *data2, size_t data2_len);
 
 #endif /* _NTFS_COLLATE_H */