Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-14 04:54:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

[0.4.7][NTFS] DPRINT1->DPRINT, EOL-WS

Browse source 
First part with the typo in the assert was introduced by 5579428b4f
which was merged into ros by a merge-task during 0.4.8-dev'ing.
releases/0.4.7 didn't have that code yet.
fix picked from 0.4.15-dev-5035-g f308c6a2bc
I still mention 'PrintAllVCNs(): Fix a typo in an ASSERT() (#4682)' here to keep my commits
grouped together in that PR.
----------
[NTFS] Do not print debug message for every function call by default
That 2nd part was picked from 0.4.13-dev-450-g 1552434940
----------
And for all the files that I had to touch for the 2nd part in the older branches,
I ported back also some EOL-whitespace-fixes within like they were done during 0.4.15-dev'ing.
This commit is contained in:
Joachim Henze 2022-10-16 23:46:35 +02:00
parent a230f831ae
commit 677de9af04
7 changed files with 28 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

12
drivers/filesystems/ntfs/create.c
View file

@ -111,7 +111,7 @@ NtfsMoonWalkID(PDEVICE_EXTENSION DeviceExt,
WCHAR FullPath[MAX_PATH]; WCHAR FullPath[MAX_PATH];
ULONG WritePosition = MAX_PATH - 1; ULONG WritePosition = MAX_PATH - 1;
DPRINT1("NtfsMoonWalkID(%p, %I64x, %p)\n", DeviceExt, Id, OutPath); DPRINT("NtfsMoonWalkID(%p, %I64x, %p)\n", DeviceExt, Id, OutPath);
RtlZeroMemory(FullPath, sizeof(FullPath)); RtlZeroMemory(FullPath, sizeof(FullPath));
MftRecord = ExAllocatePoolWithTag(NonPagedPool, MftRecord = ExAllocatePoolWithTag(NonPagedPool,
@ -183,7 +183,7 @@ NtfsOpenFileById(PDEVICE_EXTENSION DeviceExt,
PNTFS_FCB FCB; PNTFS_FCB FCB;
PFILE_RECORD_HEADER MftRecord; PFILE_RECORD_HEADER MftRecord;
DPRINT1("NtfsOpenFileById(%p, %p, %I64x, %p)\n", DeviceExt, FileObject, MftId, FoundFCB); DPRINT("NtfsOpenFileById(%p, %p, %I64x, %p)\n", DeviceExt, FileObject, MftId, FoundFCB);
ASSERT(MftId < 0x10); ASSERT(MftId < 0x10);
if (MftId > 0xb) /* No entries are used yet beyond this */ if (MftId > 0xb) /* No entries are used yet beyond this */
@ -253,7 +253,7 @@ NtfsOpenFile(PDEVICE_EXTENSION DeviceExt,
NTSTATUS Status; NTSTATUS Status;
PWSTR AbsFileName = NULL; PWSTR AbsFileName = NULL;
DPRINT1("NtfsOpenFile(%p, %p, %S, %p)\n", DeviceExt, FileObject, FileName, FoundFCB); DPRINT("NtfsOpenFile(%p, %p, %S, %p)\n", DeviceExt, FileObject, FileName, FoundFCB);
*FoundFCB = NULL; *FoundFCB = NULL;
@ -292,7 +292,7 @@ NtfsOpenFile(PDEVICE_EXTENSION DeviceExt,
ParentFcb); ParentFcb);
} }
if (!NT_SUCCESS (Status)) if (!NT_SUCCESS(Status))
{ {
DPRINT("Could not make a new FCB, status: %x\n", Status); DPRINT("Could not make a new FCB, status: %x\n", Status);
@ -335,11 +335,11 @@ NtfsCreateFile(PDEVICE_OBJECT DeviceObject,
NTSTATUS Status; NTSTATUS Status;
UNICODE_STRING FullPath; UNICODE_STRING FullPath;
DPRINT1("NtfsCreateFile(%p, %p) called\n", DeviceObject, Irp); DPRINT("NtfsCreateFile(%p, %p) called\n", DeviceObject, Irp);
DeviceExt = DeviceObject->DeviceExtension; DeviceExt = DeviceObject->DeviceExtension;
ASSERT(DeviceExt); ASSERT(DeviceExt);
Stack = IoGetCurrentIrpStackLocation (Irp); Stack = IoGetCurrentIrpStackLocation(Irp);
ASSERT(Stack); ASSERT(Stack);
RequestedDisposition = ((Stack->Parameters.Create.Options >> 24) & 0xff); RequestedDisposition = ((Stack->Parameters.Create.Options >> 24) & 0xff);

4
drivers/filesystems/ntfs/dirctl.c
View file

@ -279,7 +279,7 @@ NtfsQueryDirectory(PNTFS_IRP_CONTEXT IrpContext)
ULONGLONG MFTRecord, OldMFTRecord = 0; ULONGLONG MFTRecord, OldMFTRecord = 0;
UNICODE_STRING Pattern; UNICODE_STRING Pattern;
DPRINT1("NtfsQueryDirectory() called\n"); DPRINT("NtfsQueryDirectory() called\n");
ASSERT(IrpContext); ASSERT(IrpContext);
Irp = IrpContext->Irp; Irp = IrpContext->Irp;
@ -493,7 +493,7 @@ NtfsDirectoryControl(PNTFS_IRP_CONTEXT IrpContext)
{ {
NTSTATUS Status = STATUS_UNSUCCESSFUL; NTSTATUS Status = STATUS_UNSUCCESSFUL;
DPRINT1("NtfsDirectoryControl() called\n"); DPRINT("NtfsDirectoryControl() called\n");
switch (IrpContext->MinorFunction) switch (IrpContext->MinorFunction)
{ {

6
drivers/filesystems/ntfs/fcb.c
View file

@ -391,7 +391,7 @@ NtfsMakeFCBFromDirEntry(PNTFS_VCB Vcb,
PNTFS_FCB rcFCB; PNTFS_FCB rcFCB;
ULONGLONG Size, AllocatedSize; ULONGLONG Size, AllocatedSize;
DPRINT1("NtfsMakeFCBFromDirEntry(%p, %p, %wZ, %p, %p, %p)\n", Vcb, DirectoryFCB, Name, Stream, Record, fileFCB); DPRINT("NtfsMakeFCBFromDirEntry(%p, %p, %wZ, %p, %p, %p)\n", Vcb, DirectoryFCB, Name, Stream, Record, fileFCB);
FileName = GetBestFileNameFromRecord(Vcb, Record); FileName = GetBestFileNameFromRecord(Vcb, Record);
if (!FileName) if (!FileName)
@ -517,7 +517,7 @@ NtfsDirFindFile(PNTFS_VCB Vcb,
PNTFS_ATTR_CONTEXT DataContext; PNTFS_ATTR_CONTEXT DataContext;
USHORT Length = 0; USHORT Length = 0;
DPRINT1("NtfsDirFindFile(%p, %p, %S, %p)\n", Vcb, DirectoryFcb, FileToFind, FoundFCB); DPRINT("NtfsDirFindFile(%p, %p, %S, %p)\n", Vcb, DirectoryFcb, FileToFind, FoundFCB);
*FoundFCB = NULL; *FoundFCB = NULL;
RtlInitUnicodeString(&File, FileToFind); RtlInitUnicodeString(&File, FileToFind);
@ -609,7 +609,7 @@ NtfsGetFCBForFile(PNTFS_VCB Vcb,
#if 1 #if 1
/* Trivial case, open of the root directory on volume */ /* Trivial case, open of the root directory on volume */
if (pFileName [0] == L'\0' || wcscmp(pFileName, L"\\") == 0) if (pFileName[0] == L'\0' || wcscmp(pFileName, L"\\") == 0)
{ {
DPRINT("returning root FCB\n"); DPRINT("returning root FCB\n");

8
drivers/filesystems/ntfs/finfo.c
View file

@ -46,7 +46,7 @@ NtfsGetStandardInformation(PNTFS_FCB Fcb,
{ {
UNREFERENCED_PARAMETER(DeviceObject); UNREFERENCED_PARAMETER(DeviceObject);
DPRINT1("NtfsGetStandardInformation(%p, %p, %p, %p)\n", Fcb, DeviceObject, StandardInfo, BufferLength); DPRINT("NtfsGetStandardInformation(%p, %p, %p, %p)\n", Fcb, DeviceObject, StandardInfo, BufferLength);
if (*BufferLength < sizeof(FILE_STANDARD_INFORMATION)) if (*BufferLength < sizeof(FILE_STANDARD_INFORMATION))
return STATUS_BUFFER_TOO_SMALL; return STATUS_BUFFER_TOO_SMALL;
@ -102,7 +102,7 @@ NtfsGetBasicInformation(PFILE_OBJECT FileObject,
{ {
PFILENAME_ATTRIBUTE FileName = &Fcb->Entry; PFILENAME_ATTRIBUTE FileName = &Fcb->Entry;
DPRINT1("NtfsGetBasicInformation(%p, %p, %p, %p, %p)\n", FileObject, Fcb, DeviceObject, BasicInfo, BufferLength); DPRINT("NtfsGetBasicInformation(%p, %p, %p, %p, %p)\n", FileObject, Fcb, DeviceObject, BasicInfo, BufferLength);
if (*BufferLength < sizeof(FILE_BASIC_INFORMATION)) if (*BufferLength < sizeof(FILE_BASIC_INFORMATION))
return STATUS_BUFFER_TOO_SMALL; return STATUS_BUFFER_TOO_SMALL;
@ -136,7 +136,7 @@ NtfsGetNameInformation(PFILE_OBJECT FileObject,
UNREFERENCED_PARAMETER(FileObject); UNREFERENCED_PARAMETER(FileObject);
UNREFERENCED_PARAMETER(DeviceObject); UNREFERENCED_PARAMETER(DeviceObject);
DPRINT1("NtfsGetNameInformation(%p, %p, %p, %p, %p)\n", FileObject, Fcb, DeviceObject, NameInfo, BufferLength); DPRINT("NtfsGetNameInformation(%p, %p, %p, %p, %p)\n", FileObject, Fcb, DeviceObject, NameInfo, BufferLength);
ASSERT(NameInfo != NULL); ASSERT(NameInfo != NULL);
ASSERT(Fcb != NULL); ASSERT(Fcb != NULL);
@ -200,7 +200,7 @@ NtfsGetNetworkOpenInformation(PNTFS_FCB Fcb,
{ {
PFILENAME_ATTRIBUTE FileName = &Fcb->Entry; PFILENAME_ATTRIBUTE FileName = &Fcb->Entry;
DPRINT1("NtfsGetNetworkOpenInformation(%p, %p, %p, %p)\n", Fcb, DeviceExt, NetworkInfo, BufferLength); DPRINT("NtfsGetNetworkOpenInformation(%p, %p, %p, %p)\n", Fcb, DeviceExt, NetworkInfo, BufferLength);
if (*BufferLength < sizeof(FILE_NETWORK_OPEN_INFORMATION)) if (*BufferLength < sizeof(FILE_NETWORK_OPEN_INFORMATION))
return STATUS_BUFFER_TOO_SMALL; return STATUS_BUFFER_TOO_SMALL;

10
drivers/filesystems/ntfs/fsctl.c
View file

@ -50,7 +50,7 @@ NtfsHasFileSystem(PDEVICE_OBJECT DeviceToMount)
PBOOT_SECTOR BootSector; PBOOT_SECTOR BootSector;
NTSTATUS Status; NTSTATUS Status;
DPRINT1("NtfsHasFileSystem() called\n"); DPRINT("NtfsHasFileSystem() called\n");
Size = sizeof(DISK_GEOMETRY); Size = sizeof(DISK_GEOMETRY);
Status = NtfsDeviceIoControl(DeviceToMount, Status = NtfsDeviceIoControl(DeviceToMount,
@ -413,7 +413,7 @@ NtfsMountVolume(PDEVICE_OBJECT DeviceObject,
PNTFS_VCB Vcb = NULL; PNTFS_VCB Vcb = NULL;
NTSTATUS Status; NTSTATUS Status;
DPRINT1("NtfsMountVolume() called\n"); DPRINT("NtfsMountVolume() called\n");
if (DeviceObject != NtfsGlobalData->DeviceObject) if (DeviceObject != NtfsGlobalData->DeviceObject)
{ {
@ -722,7 +722,7 @@ GetVolumeBitmap(PDEVICE_EXTENSION DeviceExt,
ULONGLONG ToCopy; ULONGLONG ToCopy;
BOOLEAN Overflow = FALSE; BOOLEAN Overflow = FALSE;
DPRINT1("GetVolumeBitmap(%p, %p)\n", DeviceExt, Irp); DPRINT("GetVolumeBitmap(%p, %p)\n", DeviceExt, Irp);
Stack = IoGetCurrentIrpStackLocation(Irp); Stack = IoGetCurrentIrpStackLocation(Irp);
@ -891,7 +891,7 @@ NtfsUserFsRequest(PDEVICE_OBJECT DeviceObject,
PIO_STACK_LOCATION Stack; PIO_STACK_LOCATION Stack;
PDEVICE_EXTENSION DeviceExt; PDEVICE_EXTENSION DeviceExt;
DPRINT1("NtfsUserFsRequest(%p, %p)\n", DeviceObject, Irp); DPRINT("NtfsUserFsRequest(%p, %p)\n", DeviceObject, Irp);
Stack = IoGetCurrentIrpStackLocation(Irp); Stack = IoGetCurrentIrpStackLocation(Irp);
DeviceExt = DeviceObject->DeviceExtension; DeviceExt = DeviceObject->DeviceExtension;
@ -953,7 +953,7 @@ NtfsFileSystemControl(PNTFS_IRP_CONTEXT IrpContext)
PIRP Irp; PIRP Irp;
PDEVICE_OBJECT DeviceObject; PDEVICE_OBJECT DeviceObject;
DPRINT1("NtfsFileSystemControl() called\n"); DPRINT("NtfsFileSystemControl() called\n");
DeviceObject = IrpContext->DeviceObject; DeviceObject = IrpContext->DeviceObject;
Irp = IrpContext->Irp; Irp = IrpContext->Irp;

6
drivers/filesystems/ntfs/rw.c
View file

@ -59,7 +59,7 @@ NtfsReadFile(PDEVICE_EXTENSION DeviceExt,
PCHAR ReadBuffer = (PCHAR)Buffer; PCHAR ReadBuffer = (PCHAR)Buffer;
ULONGLONG StreamSize; ULONGLONG StreamSize;
DPRINT1("NtfsReadFile(%p, %p, %p, %u, %u, %x, %p)\n", DeviceExt, FileObject, Buffer, Length, ReadOffset, IrpFlags, LengthRead); DPRINT("NtfsReadFile(%p, %p, %p, %u, %u, %x, %p)\n", DeviceExt, FileObject, Buffer, Length, ReadOffset, IrpFlags, LengthRead);
*LengthRead = 0; *LengthRead = 0;
@ -164,7 +164,7 @@ NtfsReadFile(PDEVICE_EXTENSION DeviceExt,
AllocatedBuffer = TRUE; AllocatedBuffer = TRUE;
} }
DPRINT1("Effective read: %lu at %lu for stream '%S'\n", RealLength, RealReadOffset, Fcb->Stream); DPRINT("Effective read: %lu at %lu for stream '%S'\n", RealLength, RealReadOffset, Fcb->Stream);
RealLengthRead = ReadAttribute(DeviceExt, DataContext, RealReadOffset, (PCHAR)ReadBuffer, RealLength); RealLengthRead = ReadAttribute(DeviceExt, DataContext, RealReadOffset, (PCHAR)ReadBuffer, RealLength);
if (RealLengthRead == 0) if (RealLengthRead == 0)
{ {
@ -183,7 +183,7 @@ NtfsReadFile(PDEVICE_EXTENSION DeviceExt,
*LengthRead = ToRead; *LengthRead = ToRead;
DPRINT1("%lu got read\n", *LengthRead); DPRINT("%lu got read\n", *LengthRead);
if (AllocatedBuffer) if (AllocatedBuffer)
{ {

2
drivers/filesystems/ntfs/volinfo.c
View file

@ -45,7 +45,7 @@ NtfsGetFreeClusters(PDEVICE_EXTENSION DeviceExt)
ULONG Read = 0; ULONG Read = 0;
RTL_BITMAP Bitmap; RTL_BITMAP Bitmap;
DPRINT1("NtfsGetFreeClusters(%p)\n", DeviceExt); DPRINT("NtfsGetFreeClusters(%p)\n", DeviceExt);
BitmapRecord = ExAllocatePoolWithTag(NonPagedPool, BitmapRecord = ExAllocatePoolWithTag(NonPagedPool,
DeviceExt->NtfsInfo.BytesPerFileRecord, DeviceExt->NtfsInfo.BytesPerFileRecord,