https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9d33a2056ed6fa26b3e94c...
commit 9d33a2056ed6fa26b3e94cfcfb073e311e977ecd Author: Ronny Borchert rborchert@live.de AuthorDate: Fri Dec 17 23:21:01 2021 +0100 Commit: Hermès Bélusca-Maïto hermes.belusca-maito@reactos.org CommitDate: Mon Dec 20 21:19:53 2021 +0100
[NTFS][UDFS] Fix build with NDEBUG undefined (#4171)
- Fix DumpBTreeNode() parameters in ntfs/btree.c - Comment out unused variable in env_spec.cpp - Fix missed brackets in else clause in wcache_lib.cpp --- drivers/filesystems/ntfs/btree.c | 6 +++--- drivers/filesystems/udfs/Include/wcache_lib.cpp | 3 ++- drivers/filesystems/udfs/env_spec.cpp | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/drivers/filesystems/ntfs/btree.c b/drivers/filesystems/ntfs/btree.c index e8462ae8308..ed53df2c8f0 100644 --- a/drivers/filesystems/ntfs/btree.c +++ b/drivers/filesystems/ntfs/btree.c @@ -1901,7 +1901,7 @@ SplitBTreeNode(PB_TREE Tree, CaseSensitive ? "TRUE" : "FALSE");
#ifndef NDEBUG - DumpBTreeNode(Node, 0, 0); + DumpBTreeNode(Tree, Node, 0, 0); #endif
// Create the right hand sibling @@ -2020,10 +2020,10 @@ SplitBTreeNode(PB_TREE Tree,
#ifndef NDEBUG DPRINT1("Left-hand node after split:\n"); - DumpBTreeNode(Node, 0, 0); + DumpBTreeNode(Tree, Node, 0, 0);
DPRINT1("Right-hand sibling node after split:\n"); - DumpBTreeNode(*NewRightHandSibling, 0, 0); + DumpBTreeNode(Tree, *NewRightHandSibling, 0, 0); #endif
return STATUS_SUCCESS; diff --git a/drivers/filesystems/udfs/Include/wcache_lib.cpp b/drivers/filesystems/udfs/Include/wcache_lib.cpp index 2ab2a2dbf01..dc933aa260a 100644 --- a/drivers/filesystems/udfs/Include/wcache_lib.cpp +++ b/drivers/filesystems/udfs/Include/wcache_lib.cpp @@ -1128,10 +1128,11 @@ WCacheUpdatePacket( (PVOID)WCacheSectorAddr(block_array, Lba0), BS) != BS); } - if(mod) + if(mod) { DbgCopyMemory(tmp_buff2 + (i << BSh), (PVOID)WCacheSectorAddr(block_array, Lba0), BS); + } } }
diff --git a/drivers/filesystems/udfs/env_spec.cpp b/drivers/filesystems/udfs/env_spec.cpp index 32dc56181c0..93bb08322c6 100644 --- a/drivers/filesystems/udfs/env_spec.cpp +++ b/drivers/filesystems/udfs/env_spec.cpp @@ -307,7 +307,7 @@ UDFPhWriteSynchronous( KeQuerySystemTime((PLARGE_INTEGER)&IoEnterTime); #endif //MEASURE_IO_PERFORMANCE
-#if defined UDF_DBG || defined USE_PERF_PRINT +#ifdef USE_PERF_PRINT ULONG Lba = (ULONG)(Offset>>0xb); // ASSERT(!(Lba & (32-1))); PerfPrint(("UDFPhWrite: Length: %x Lba: %lx\n",Length>>0xb,Lba));