[Linux-NTFS-cvs] CVS: ntfs-driver-tng/scripts compat.c,1.4,1.5

[Richard R. <fl...@us...>]

Changes by: flatcap

Update of /cvsroot/linux-ntfs/ntfs-driver-tng/scripts
In directory usw-pr-cvs1:/tmp/cvs-serv24569

Modified Files:
	compat.c 
Log Message:
more debugging stuff


Index: compat.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-tng/scripts/compat.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -U2 -r1.4 -r1.5
--- compat.c	10 Feb 2002 19:21:44 -0000	1.4
+++ compat.c	11 Feb 2002 03:58:46 -0000	1.5
@@ -7,4 +7,7 @@
 #include <fcntl.h>
 
+#define static
+#define inline
+
 typedef signed char s8;
 typedef unsigned char u8;
@@ -211,16 +214,24 @@
 int ntfs_f = 0;
 
-static inline void *ntfs_malloc_nofs(unsigned long size)
+static inline void *__ntfs_malloc_nofs(unsigned long size, char *fn)
 {
+	void *ptr = NULL;
 	ntfs_a++;
-	return malloc((size + PAGE_SIZE - 1) & ~(PAGE_SIZE - 1));
+
+	ptr = malloc((size + PAGE_SIZE - 1) & ~(PAGE_SIZE - 1));
+	//printf ("malloc %p %6lu in %s\n", ptr, size, fn);
+	return ptr;
 }
 
-static inline void ntfs_free(void *addr)
+static inline void __ntfs_free(void *addr, char *fn)
 {
 	ntfs_f++;
+	//printf ("free   %p        in %s\n", addr, fn);
 	free(addr);
 }
 
+#define ntfs_malloc_nofs(X)	__ntfs_malloc_nofs((X), __FUNCTION__)
+#define ntfs_free(X)		__ntfs_free((X), __FUNCTION__)
+
 #undef vsnprintf
 int vsnprintf (char *s, size_t maxlen, const char *format, _G_va_list arg);
@@ -245,5 +256,5 @@
 {
 	int i;
-	const char *lcn_str[5] = { "HOLE", "NMAP", "!ENT", "EINV", "XXXX" };
+	const char *lcn_str[5] = { "HOLE", "NOTMAP", "ENOENT", "EINVAL", "XXXX" };
 
 	if (!rl) {
@@ -251,5 +262,5 @@
 		return;
 	}
-	printf("         VCN      LCN      len\n");
+	printf("     VCN      LCN      len\n");
 	for (i = 0; ; i++) {
 		LCN lcn = (rl + i)->lcn;
@@ -260,9 +271,9 @@
 			if (index > -LCN_EINVAL - 1)
 				index = 4;
-			printf("    %8lld %s %8lld\n",
+			printf("%8lld %8s %8lld\n",
 				(rl + i)->vcn, lcn_str[index],
 				(rl + i)->length);
 		} else
-			printf("    %8lld %8lld %8lld\n",
+			printf("%8lld %8lld %8lld\n",
 				(rl + i)->vcn, (rl + i)->lcn,
 				(rl + i)->length);