[ros-diffs] 01/01: [USETUP] Some fixes/improvements suggested by Thomas (2/2).

[Hermès Bélusca-Maïto]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c434a5ab21780b3ca42299da3dc6f5b46b978bc3

commit c434a5ab21780b3ca42299da3dc6f5b46b978bc3
Author:     Hermès Bélusca-Maïto <hermes.belusca-ma...@reactos.org>
AuthorDate: Mon May 22 17:55:16 2017 +0200
Commit:     Hermès Bélusca-Maïto <hermes.belusca-ma...@reactos.org>
CommitDate: Thu May 31 19:54:09 2018 +0200

    [USETUP] Some fixes/improvements suggested by Thomas (2/2).
    
    - In the partlist.c disk getters: Remove useless 
"IsListEmpty(&List->DiskListHead)" checks, because this is actually the kind of 
check the while() loop does just after...
    - Fix few DPRINTs.
    
    svn path=/branches/setup_improvements/; revision=74629
---
 base/setup/lib/partlist.c   | 16 ----------------
 base/setup/usetup/filesup.c | 21 +++++----------------
 2 files changed, 5 insertions(+), 32 deletions(-)

diff --git a/base/setup/lib/partlist.c b/base/setup/lib/partlist.c
index d2d3f36768..7b74cda8f0 100644
--- a/base/setup/lib/partlist.c
+++ b/base/setup/lib/partlist.c
@@ -1352,10 +1352,6 @@ GetDiskByBiosNumber(
     PDISKENTRY DiskEntry;
     PLIST_ENTRY Entry;
 
-    /* Check for empty disks */
-    if (IsListEmpty(&List->DiskListHead))
-        return NULL;
-
     /* Loop over the disks and find the correct one */
     Entry = List->DiskListHead.Flink;
     while (Entry != &List->DiskListHead)
@@ -1382,10 +1378,6 @@ GetDiskByNumber(
     PDISKENTRY DiskEntry;
     PLIST_ENTRY Entry;
 
-    /* Check for empty disks */
-    if (IsListEmpty(&List->DiskListHead))
-        return NULL;
-
     /* Loop over the disks and find the correct one */
     Entry = List->DiskListHead.Flink;
     while (Entry != &List->DiskListHead)
@@ -1414,10 +1406,6 @@ GetDiskBySCSI(
     PDISKENTRY DiskEntry;
     PLIST_ENTRY Entry;
 
-    /* Check for empty disks */
-    if (IsListEmpty(&List->DiskListHead))
-        return NULL;
-
     /* Loop over the disks and find the correct one */
     Entry = List->DiskListHead.Flink;
     while (Entry != &List->DiskListHead)
@@ -1446,10 +1434,6 @@ GetDiskBySignature(
     PDISKENTRY DiskEntry;
     PLIST_ENTRY Entry;
 
-    /* Check for empty disks */
-    if (IsListEmpty(&List->DiskListHead))
-        return NULL;
-
     /* Loop over the disks and find the correct one */
     Entry = List->DiskListHead.Flink;
     while (Entry != &List->DiskListHead)
diff --git a/base/setup/usetup/filesup.c b/base/setup/usetup/filesup.c
index b7fdf692f1..b466e4e38d 100644
--- a/base/setup/usetup/filesup.c
+++ b/base/setup/usetup/filesup.c
@@ -679,12 +679,7 @@ NtPathToDiskPartComponents(
     DiskNumber = wcstoul(Path, (PWSTR*)&Path, 10);
 
     /* Either NULL termination, or a path separator must be present now */
-    if (!Path)
-    {
-        DPRINT1("An error happened!\n");
-        return FALSE;
-    }
-    else if (*Path && *Path != OBJ_NAME_PATH_SEPARATOR)
+    if (*Path && *Path != OBJ_NAME_PATH_SEPARATOR)
     {
         DPRINT1("'%S' : expected a path separator!\n", Path);
         return FALSE;
@@ -717,13 +712,7 @@ NtPathToDiskPartComponents(
     PartNumber = wcstoul(Path, (PWSTR*)&Path, 10);
 
     /* Either NULL termination, or a path separator must be present now */
-    if (!Path)
-    {
-        /* We fail here because wcstoul failed for whatever reason */
-        DPRINT1("An error happened!\n");
-        return FALSE;
-    }
-    else if (*Path && *Path != OBJ_NAME_PATH_SEPARATOR)
+    if (*Path && *Path != OBJ_NAME_PATH_SEPARATOR)
     {
         /* We shouldn't fail here because it just means this part of path is 
actually not a partition specifier. Or should we? */
         DPRINT1("'%S' : expected a path separator!\n", Path);
@@ -788,7 +777,7 @@ OpenAndMapFile(
                         FILE_SYNCHRONOUS_IO_NONALERT | 
FILE_NON_DIRECTORY_FILE);
     if (!NT_SUCCESS(Status))
     {
-        DPRINT1("Failed to open file %wZ, Status 0x%08lx\n", &Name, Status);
+        DPRINT1("Failed to open file '%wZ', Status 0x%08lx\n", &Name, Status);
         return Status;
     }
 
@@ -810,7 +799,7 @@ OpenAndMapFile(
         }
 
         if (FileInfo.EndOfFile.HighPart != 0)
-            DPRINT1("WARNING!! The file %wZ is too large!\n", Name);
+            DPRINT1("WARNING!! The file '%wZ' is too large!\n", &Name);
 
         *FileSize = FileInfo.EndOfFile.LowPart;
 
@@ -829,7 +818,7 @@ OpenAndMapFile(
                              *FileHandle);
     if (!NT_SUCCESS(Status))
     {
-        DPRINT1("Failed to create a memory section for file %wZ, Status 
0x%08lx\n", &Name, Status);
+        DPRINT1("Failed to create a memory section for file '%wZ', Status 
0x%08lx\n", &Name, Status);
         NtClose(*FileHandle);
         *FileHandle = NULL;
         return Status;