Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-03 11:14:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

[0.4.10][NTFS] PrintAllVCNs(): Fix a typo in an ASSERT() (#4682), 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
----------
[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:32:17 +02:00
parent 51b4d6fa79
commit 6034251432
8 changed files with 96 additions and 96 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
drivers/filesystems/ntfs/btree.c
View file

@ -56,7 +56,7 @@ PrintAllVCNs(PDEVICE_EXTENSION Vcb,
BytesRead = ReadAttribute(Vcb, IndexAllocationContext, 0, (PCHAR)Buffer, BufferSize); BytesRead = ReadAttribute(Vcb, IndexAllocationContext, 0, (PCHAR)Buffer, BufferSize);
ASSERT(BytesRead = BufferSize); ASSERT(BytesRead == BufferSize);
CurrentNode = Buffer; CurrentNode = Buffer;
@ -694,7 +694,7 @@ CreateBTreeFromIndex(PDEVICE_EXTENSION Vcb,
PNTFS_ATTR_CONTEXT IndexAllocationContext = NULL; PNTFS_ATTR_CONTEXT IndexAllocationContext = NULL;
NTSTATUS Status; NTSTATUS Status;
DPRINT1("CreateBTreeFromIndex(%p, %p)\n", IndexRoot, NewTree); DPRINT("CreateBTreeFromIndex(%p, %p)\n", IndexRoot, NewTree);
if (!Tree || !RootNode || !CurrentKey) if (!Tree || !RootNode || !CurrentKey)
{ {
@ -920,7 +920,7 @@ CreateIndexRootFromBTree(PDEVICE_EXTENSION DeviceExt,
DeviceExt->NtfsInfo.BytesPerFileRecord, DeviceExt->NtfsInfo.BytesPerFileRecord,
TAG_NTFS); TAG_NTFS);
DPRINT1("CreateIndexRootFromBTree(%p, %p, 0x%lx, %p, %p)\n", DeviceExt, Tree, MaxIndexSize, IndexRoot, Length); DPRINT("CreateIndexRootFromBTree(%p, %p, 0x%lx, %p, %p)\n", DeviceExt, Tree, MaxIndexSize, IndexRoot, Length);
#ifndef NDEBUG #ifndef NDEBUG
DumpBTree(Tree); DumpBTree(Tree);
@ -1091,7 +1091,7 @@ DemoteBTreeRoot(PB_TREE Tree)
PB_TREE_FILENAME_NODE NewSubNode, NewIndexRoot; PB_TREE_FILENAME_NODE NewSubNode, NewIndexRoot;
PB_TREE_KEY DummyKey; PB_TREE_KEY DummyKey;
DPRINT1("Collapsing Index Root into sub-node.\n"); DPRINT("Collapsing Index Root into sub-node.\n");
#ifndef NDEBUG #ifndef NDEBUG
DumpBTree(Tree); DumpBTree(Tree);
@ -1192,7 +1192,7 @@ UpdateIndexAllocation(PDEVICE_EXTENSION DeviceExt,
ULONG i; ULONG i;
ULONG IndexAllocationOffset; ULONG IndexAllocationOffset;
DPRINT1("UpdateIndexAllocation() called.\n"); DPRINT("UpdateIndexAllocation() called.\n");
Status = FindAttribute(DeviceExt, FileRecord, AttributeIndexAllocation, L"$I30", 4, &IndexAllocationContext, &IndexAllocationOffset); Status = FindAttribute(DeviceExt, FileRecord, AttributeIndexAllocation, L"$I30", 4, &IndexAllocationContext, &IndexAllocationOffset);
if (NT_SUCCESS(Status)) if (NT_SUCCESS(Status))
@ -1708,7 +1708,7 @@ NtfsInsertKey(PB_TREE Tree,
*MedianKey = NULL; *MedianKey = NULL;
*NewRightHandSibling = NULL; *NewRightHandSibling = NULL;
DPRINT1("NtfsInsertKey(%p, 0x%I64x, %p, %p, %s, %lu, %lu, %p, %p)\n", DPRINT("NtfsInsertKey(%p, 0x%I64x, %p, %p, %s, %lu, %lu, %p, %p)\n",
Tree, Tree,
FileReference, FileReference,
FileNameAttribute, FileNameAttribute,
@ -1893,7 +1893,7 @@ SplitBTreeNode(PB_TREE Tree,
ULONG SizeSum; ULONG SizeSum;
ULONG i; ULONG i;
DPRINT1("SplitBTreeNode(%p, %p, %p, %p, %s) called\n", DPRINT("SplitBTreeNode(%p, %p, %p, %p, %s) called\n",
Tree, Tree,
Node, Node,
MedianKey, MedianKey,

14
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 = ExAllocateFromNPagedLookasideList(&DeviceExt->FileRecLookasideList); MftRecord = ExAllocateFromNPagedLookasideList(&DeviceExt->FileRecLookasideList);
@ -181,7 +181,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 < NTFS_FILE_FIRST_USER_FILE); ASSERT(MftId < NTFS_FILE_FIRST_USER_FILE);
if (MftId > 0xb) /* No entries are used yet beyond this */ if (MftId > 0xb) /* No entries are used yet beyond this */
@ -250,7 +250,7 @@ NtfsOpenFile(PDEVICE_EXTENSION DeviceExt,
NTSTATUS Status; NTSTATUS Status;
PWSTR AbsFileName = NULL; PWSTR AbsFileName = NULL;
DPRINT1("NtfsOpenFile(%p, %p, %S, %s, %p)\n", DPRINT("NtfsOpenFile(%p, %p, %S, %s, %p)\n",
DeviceExt, DeviceExt,
FileObject, FileObject,
FileName, FileName,
@ -339,7 +339,7 @@ NtfsCreateFile(PDEVICE_OBJECT DeviceObject,
UNICODE_STRING FullPath; UNICODE_STRING FullPath;
PIRP Irp = IrpContext->Irp; PIRP Irp = IrpContext->Irp;
DPRINT1("NtfsCreateFile(%p, %p) called\n", DeviceObject, IrpContext); DPRINT("NtfsCreateFile(%p, %p) called\n", DeviceObject, IrpContext);
DeviceExt = DeviceObject->DeviceExtension; DeviceExt = DeviceObject->DeviceExtension;
ASSERT(DeviceExt); ASSERT(DeviceExt);
@ -695,7 +695,7 @@ NtfsCreateDirectory(PDEVICE_EXTENSION DeviceExt,
ULONG MaxIndexRootSize; ULONG MaxIndexRootSize;
ULONG RootLength; ULONG RootLength;
DPRINT1("NtfsCreateFileRecord(%p, %p, %s, %s)\n", DPRINT("NtfsCreateFileRecord(%p, %p, %s, %s)\n",
DeviceExt, DeviceExt,
FileObject, FileObject,
CaseSensitive ? "TRUE" : "FALSE", CaseSensitive ? "TRUE" : "FALSE",
@ -820,7 +820,7 @@ NtfsCreateEmptyFileRecord(PDEVICE_EXTENSION DeviceExt)
PFILE_RECORD_HEADER FileRecord; PFILE_RECORD_HEADER FileRecord;
PNTFS_ATTR_RECORD NextAttribute; PNTFS_ATTR_RECORD NextAttribute;
DPRINT1("NtfsCreateEmptyFileRecord(%p)\n", DeviceExt); DPRINT("NtfsCreateEmptyFileRecord(%p)\n", DeviceExt);
// allocate memory for file record // allocate memory for file record
FileRecord = ExAllocateFromNPagedLookasideList(&DeviceExt->FileRecLookasideList); FileRecord = ExAllocateFromNPagedLookasideList(&DeviceExt->FileRecLookasideList);
@ -895,7 +895,7 @@ NtfsCreateFileRecord(PDEVICE_EXTENSION DeviceExt,
ULONGLONG ParentMftIndex; ULONGLONG ParentMftIndex;
ULONGLONG FileMftIndex; ULONGLONG FileMftIndex;
DPRINT1("NtfsCreateFileRecord(%p, %p, %s, %s)\n", DPRINT("NtfsCreateFileRecord(%p, %p, %s, %s)\n",
DeviceExt, DeviceExt,
FileObject, FileObject,
CaseSensitive ? "TRUE" : "FALSE", CaseSensitive ? "TRUE" : "FALSE",

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

@ -378,7 +378,7 @@ NtfsQueryDirectory(PNTFS_IRP_CONTEXT IrpContext)
UNICODE_STRING Pattern; UNICODE_STRING Pattern;
ULONG Written; ULONG Written;
DPRINT1("NtfsQueryDirectory() called\n"); DPRINT("NtfsQueryDirectory() called\n");
ASSERT(IrpContext); ASSERT(IrpContext);
Irp = IrpContext->Irp; Irp = IrpContext->Irp;
@ -591,7 +591,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)
{ {

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

@ -389,7 +389,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)
@ -516,7 +516,7 @@ NtfsDirFindFile(PNTFS_VCB Vcb,
PNTFS_ATTR_CONTEXT DataContext; PNTFS_ATTR_CONTEXT DataContext;
USHORT Length = 0; USHORT Length = 0;
DPRINT1("NtfsDirFindFile(%p, %p, %S, %s, %p)\n", DPRINT("NtfsDirFindFile(%p, %p, %S, %s, %p)\n",
Vcb, Vcb,
DirectoryFcb, DirectoryFcb,
FileToFind, FileToFind,

10
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;
@ -727,7 +727,7 @@ NtfsSetInformation(PNTFS_IRP_CONTEXT IrpContext)
PDEVICE_OBJECT DeviceObject; PDEVICE_OBJECT DeviceObject;
NTSTATUS Status = STATUS_NOT_IMPLEMENTED; NTSTATUS Status = STATUS_NOT_IMPLEMENTED;
DPRINT1("NtfsSetInformation(%p)\n", IrpContext); DPRINT("NtfsSetInformation(%p)\n", IrpContext);
Irp = IrpContext->Irp; Irp = IrpContext->Irp;
Stack = IrpContext->Stack; Stack = IrpContext->Stack;

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,
@ -425,7 +425,7 @@ NtfsMountVolume(PDEVICE_OBJECT DeviceObject,
NTSTATUS Status; NTSTATUS Status;
BOOLEAN Lookaside = FALSE; BOOLEAN Lookaside = FALSE;
DPRINT1("NtfsMountVolume() called\n"); DPRINT("NtfsMountVolume() called\n");
if (DeviceObject != NtfsGlobalData->DeviceObject) if (DeviceObject != NtfsGlobalData->DeviceObject)
{ {
@ -737,7 +737,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);
@ -904,7 +904,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;
@ -966,7 +966,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;

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

@ -60,7 +60,7 @@ NtfsReadFile(PDEVICE_EXTENSION DeviceExt,
PCHAR ReadBuffer = (PCHAR)Buffer; PCHAR ReadBuffer = (PCHAR)Buffer;
ULONGLONG StreamSize; ULONGLONG StreamSize;
DPRINT1("NtfsReadFile(%p, %p, %p, %lu, %lu, %lx, %p)\n", DeviceExt, FileObject, Buffer, Length, ReadOffset, IrpFlags, LengthRead); DPRINT("NtfsReadFile(%p, %p, %p, %lu, %lu, %lx, %p)\n", DeviceExt, FileObject, Buffer, Length, ReadOffset, IrpFlags, LengthRead);
*LengthRead = 0; *LengthRead = 0;

10
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 = ExAllocateFromNPagedLookasideList(&DeviceExt->FileRecLookasideList); BitmapRecord = ExAllocateFromNPagedLookasideList(&DeviceExt->FileRecLookasideList);
if (BitmapRecord == NULL) if (BitmapRecord == NULL)
@ -118,7 +118,7 @@ NtfsAllocateClusters(PDEVICE_EXTENSION DeviceExt,
ULONG AssignedRun; ULONG AssignedRun;
ULONG LengthWritten; ULONG LengthWritten;
DPRINT1("NtfsAllocateClusters(%p, %lu, %lu, %p, %p)\n", DeviceExt, FirstDesiredCluster, DesiredClusters, FirstAssignedCluster, AssignedClusters); DPRINT("NtfsAllocateClusters(%p, %lu, %lu, %p, %p)\n", DeviceExt, FirstDesiredCluster, DesiredClusters, FirstAssignedCluster, AssignedClusters);
BitmapRecord = ExAllocateFromNPagedLookasideList(&DeviceExt->FileRecLookasideList); BitmapRecord = ExAllocateFromNPagedLookasideList(&DeviceExt->FileRecLookasideList);
if (BitmapRecord == NULL) if (BitmapRecord == NULL)
@ -151,9 +151,9 @@ NtfsAllocateClusters(PDEVICE_EXTENSION DeviceExt,
return STATUS_INSUFFICIENT_RESOURCES; return STATUS_INSUFFICIENT_RESOURCES;
} }
DPRINT1("Total clusters: %I64x\n", DeviceExt->NtfsInfo.ClusterCount); DPRINT("Total clusters: %I64x\n", DeviceExt->NtfsInfo.ClusterCount);
DPRINT1("Total clusters in bitmap: %I64x\n", BitmapDataSize * 8); DPRINT("Total clusters in bitmap: %I64x\n", BitmapDataSize * 8);
DPRINT1("Diff in size: %I64d B\n", ((BitmapDataSize * 8) - DeviceExt->NtfsInfo.ClusterCount) * DeviceExt->NtfsInfo.SectorsPerCluster * DeviceExt->NtfsInfo.BytesPerSector); DPRINT("Diff in size: %I64d B\n", ((BitmapDataSize * 8) - DeviceExt->NtfsInfo.ClusterCount) * DeviceExt->NtfsInfo.SectorsPerCluster * DeviceExt->NtfsInfo.BytesPerSector);
ReadAttribute(DeviceExt, DataContext, 0, (PCHAR)BitmapData, (ULONG)BitmapDataSize); ReadAttribute(DeviceExt, DataContext, 0, (PCHAR)BitmapData, (ULONG)BitmapDataSize);