[Linux-NTFS-cvs] CVS: ntfsprogs/include/ntfs debug.h,1.10,1.11

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

Changes by: uvman

Update of /cvsroot/linux-ntfs/ntfsprogs/include/ntfs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9124/include/ntfs

Modified Files:
	debug.h 
Log Message:
Remove any uses of the old logging system (Dputs, Dprintf, ...) from libntfs.

Index: debug.h
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/include/ntfs/debug.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- debug.h	21 Oct 2005 18:05:13 -0000	1.10
+++ debug.h	24 Oct 2005 20:50:05 -0000	1.11
@@ -29,15 +29,8 @@
 #ifdef HAVE_STDIO_H
 #include <stdio.h>
 #endif
-#ifdef HAVE_STDARG_H
-#include <stdarg.h>
-#endif
-#ifdef HAVE_STRING_H
-#include <string.h>
-#endif
-#ifdef HAVE_ERRNO_H
-#include <errno.h>
-#endif
+
+#include "logging.h"
 
 struct _runlist_element;
 
@@ -85,12 +78,12 @@ static __inline__ void ntfs_debug_runlis
 extern void ntfs_debug_runlist_dump(const struct _runlist_element *rl);
 #endif
 
-#define NTFS_BUG(msg)							  \
-{									  \
-	int ___i;							  \
-	fprintf(stderr, "libntfs: Bug in %s(): %s\n", __FUNCTION__, msg); \
-	Dputs("Forcing segmentation fault!");				  \
-	___i = ((int*)NULL)[1];						  \
+#define NTFS_BUG(msg)							\
+{									\
+	int ___i;							\
+	ntfs_log_critical("Bug in %s(): %s\n", __FUNCTION__, msg);	\
+	ntfs_log_debug("Forcing segmentation fault!");			\
+	___i = ((int*)NULL)[1];						\
 }
 
 #endif /* defined _NTFS_DEBUG_H */