From e45d903111989d048c5dc2e662e76c4c9a91054d Mon Sep 17 00:00:00 2001 From: Aleksey Bragin Date: Fri, 4 May 2007 13:40:14 +0000 Subject: [PATCH] - Fixes and changes to NPFS debug printing system, so it actually works now. svn path=/trunk/; revision=26635 --- reactos/drivers/filesystems/npfs_new/create.c | 8 ++++---- reactos/drivers/filesystems/npfs_new/finfo.c | 4 ++-- reactos/drivers/filesystems/npfs_new/fsctrl.c | 4 ++-- reactos/drivers/filesystems/npfs_new/npfs.c | 4 ++-- reactos/drivers/filesystems/npfs_new/npfs.h | 3 ++- reactos/drivers/filesystems/npfs_new/rw.c | 6 +++--- reactos/drivers/filesystems/npfs_new/volume.c | 2 +- 7 files changed, 16 insertions(+), 15 deletions(-) diff --git a/reactos/drivers/filesystems/npfs_new/create.c b/reactos/drivers/filesystems/npfs_new/create.c index 32c7693909a..27814392723 100644 --- a/reactos/drivers/filesystems/npfs_new/create.c +++ b/reactos/drivers/filesystems/npfs_new/create.c @@ -18,7 +18,7 @@ NTSTATUS NTAPI NpfsCreate(PDEVICE_OBJECT DeviceObject, PIRP Irp) { - NpfsDbgPrint(NPFS_DEBUG_HIGHEST, "IRP_MJ_CREATE\n"); + NpfsDbgPrint(NPFS_DL_API_TRACE, "IRP_MJ_CREATE\n"); IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_SUCCESS; @@ -27,7 +27,7 @@ NpfsCreate(PDEVICE_OBJECT DeviceObject, PIRP Irp) NTSTATUS NTAPI NpfsCreateNamedPipe(PDEVICE_OBJECT DeviceObject, PIRP Irp) { - NpfsDbgPrint(NPFS_DEBUG_HIGHEST, "IRP_MJ_CREATE Named Pipe\n"); + NpfsDbgPrint(NPFS_DL_API_TRACE, "IRP_MJ_CREATE Named Pipe\n"); IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_SUCCESS; @@ -36,7 +36,7 @@ NpfsCreateNamedPipe(PDEVICE_OBJECT DeviceObject, PIRP Irp) NTSTATUS NTAPI NpfsCleanup(PDEVICE_OBJECT DeviceObject, PIRP Irp) { - NpfsDbgPrint(NPFS_DEBUG_HIGHEST, "Cleanup\n"); + NpfsDbgPrint(NPFS_DL_API_TRACE, "Cleanup\n"); IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_SUCCESS; @@ -45,7 +45,7 @@ NpfsCleanup(PDEVICE_OBJECT DeviceObject, PIRP Irp) NTSTATUS NTAPI NpfsClose(PDEVICE_OBJECT DeviceObject, PIRP Irp) { - NpfsDbgPrint(NPFS_DEBUG_HIGHEST, "IRP_MJ_CLOSE\n"); + NpfsDbgPrint(NPFS_DL_API_TRACE, "IRP_MJ_CLOSE\n"); IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_SUCCESS; diff --git a/reactos/drivers/filesystems/npfs_new/finfo.c b/reactos/drivers/filesystems/npfs_new/finfo.c index b8feeaf7040..5d257aae37b 100644 --- a/reactos/drivers/filesystems/npfs_new/finfo.c +++ b/reactos/drivers/filesystems/npfs_new/finfo.c @@ -20,7 +20,7 @@ NpfsQueryInformation(PDEVICE_OBJECT DeviceObject, PIRP Irp) { FsRtlEnterFileSystem(); - NpfsDbgPrint(NPFS_DEBUG_HIGHEST, "NpfsQueryInformation()\n"); + NpfsDbgPrint(NPFS_DL_API_TRACE, "NpfsQueryInformation()\n"); /* TODO: Implement */ IoCompleteRequest(Irp, IO_NO_INCREMENT); @@ -35,7 +35,7 @@ NpfsSetInformation(PDEVICE_OBJECT DeviceObject, PIRP Irp) { FsRtlEnterFileSystem(); - NpfsDbgPrint(NPFS_DEBUG_HIGHEST, "NpfsSetInformation()\n"); + NpfsDbgPrint(NPFS_DL_API_TRACE, "NpfsSetInformation()\n"); /* TODO: Implement */ IoCompleteRequest(Irp, IO_NO_INCREMENT); diff --git a/reactos/drivers/filesystems/npfs_new/fsctrl.c b/reactos/drivers/filesystems/npfs_new/fsctrl.c index 97337d8051d..bd6d808f76f 100644 --- a/reactos/drivers/filesystems/npfs_new/fsctrl.c +++ b/reactos/drivers/filesystems/npfs_new/fsctrl.c @@ -20,7 +20,7 @@ NpfsDirectoryControl(PDEVICE_OBJECT DeviceObject, PIRP Irp) { FsRtlEnterFileSystem(); - NpfsDbgPrint(NPFS_DEBUG_HIGHEST, "NpfsDirectoryControl()\n"); + NpfsDbgPrint(NPFS_DL_API_TRACE, "NpfsDirectoryControl()\n"); /* TODO: Implement */ IoCompleteRequest(Irp, IO_NO_INCREMENT); @@ -35,7 +35,7 @@ NpfsFileSystemControl(PDEVICE_OBJECT DeviceObject, PIRP Irp) { FsRtlEnterFileSystem(); - NpfsDbgPrint(NPFS_DEBUG_HIGHEST, "NpfsFileSystemControl()\n"); + NpfsDbgPrint(NPFS_DL_API_TRACE, "NpfsFileSystemControl()\n"); /* TODO: Implement */ IoCompleteRequest(Irp, IO_NO_INCREMENT); diff --git a/reactos/drivers/filesystems/npfs_new/npfs.c b/reactos/drivers/filesystems/npfs_new/npfs.c index 1d1ae077b76..15583a48e4c 100644 --- a/reactos/drivers/filesystems/npfs_new/npfs.c +++ b/reactos/drivers/filesystems/npfs_new/npfs.c @@ -13,7 +13,7 @@ //#define NDEBUG #include -ULONG NpfsDebugLevel = NPFS_DEBUG_HIGHEST; +ULONG NpfsDebugLevel = NPFS_DL_API_TRACE; /* FUNCTIONS *****************************************************************/ @@ -86,7 +86,7 @@ NpfsDbgPrint(ULONG Level, char *fmt, ...) va_list args; char str[300]; - if ((NpfsDebugLevel & Level) == 0) + if (!(NpfsDebugLevel & Level)) return; va_start(args, fmt); diff --git a/reactos/drivers/filesystems/npfs_new/npfs.h b/reactos/drivers/filesystems/npfs_new/npfs.h index b6190957fc7..e5887afb36f 100644 --- a/reactos/drivers/filesystems/npfs_new/npfs.h +++ b/reactos/drivers/filesystems/npfs_new/npfs.h @@ -8,7 +8,8 @@ #include /* Debug Levels */ -#define NPFS_DEBUG_HIGHEST 0x0 +#define NPFS_DL_NONE 0x00000000 +#define NPFS_DL_API_TRACE 0x00000001 typedef struct _NPFS_DEVICE_EXTENSION { diff --git a/reactos/drivers/filesystems/npfs_new/rw.c b/reactos/drivers/filesystems/npfs_new/rw.c index 70b31091943..e2d3cf22ffa 100644 --- a/reactos/drivers/filesystems/npfs_new/rw.c +++ b/reactos/drivers/filesystems/npfs_new/rw.c @@ -48,7 +48,7 @@ NpfsRead(PDEVICE_OBJECT DeviceObject, PIRP Irp) { FsRtlEnterFileSystem(); - NpfsDbgPrint(NPFS_DEBUG_HIGHEST, "NpfsRead()\n"); + NpfsDbgPrint(NPFS_DL_API_TRACE, "NpfsRead()\n"); /* TODO: Implement */ IoCompleteRequest(Irp, IO_NO_INCREMENT); @@ -63,7 +63,7 @@ NpfsWrite(PDEVICE_OBJECT DeviceObject, PIRP Irp) { FsRtlEnterFileSystem(); - NpfsDbgPrint(NPFS_DEBUG_HIGHEST, "NpfsWrite()\n"); + NpfsDbgPrint(NPFS_DL_API_TRACE, "NpfsWrite()\n"); /* TODO: Implement */ IoCompleteRequest(Irp, IO_NO_INCREMENT); @@ -78,7 +78,7 @@ NpfsFlushBuffers(PDEVICE_OBJECT DeviceObject, PIRP Irp) { FsRtlEnterFileSystem(); - NpfsDbgPrint(NPFS_DEBUG_HIGHEST, "NpfsFlushBuffers()\n"); + NpfsDbgPrint(NPFS_DL_API_TRACE, "NpfsFlushBuffers()\n"); /* TODO: Implement */ IoCompleteRequest(Irp, IO_NO_INCREMENT); diff --git a/reactos/drivers/filesystems/npfs_new/volume.c b/reactos/drivers/filesystems/npfs_new/volume.c index 38ed8c46139..ee956ca8ca7 100644 --- a/reactos/drivers/filesystems/npfs_new/volume.c +++ b/reactos/drivers/filesystems/npfs_new/volume.c @@ -20,7 +20,7 @@ NpfsQueryVolumeInformation(PDEVICE_OBJECT DeviceObject, PIRP Irp) { FsRtlEnterFileSystem(); - NpfsDbgPrint(NPFS_DEBUG_HIGHEST, "NpfsQueryVolumeInformation()\n"); + NpfsDbgPrint(NPFS_DL_API_TRACE, "NpfsQueryVolumeInformation()\n"); /* TODO: Implement */ IoCompleteRequest(Irp, IO_NO_INCREMENT);