[ros-diffs] [hbelusca] 74733: [NTOS]: Minor code formatting + don't leak a handle in case of failure, in CmpInitializeHardwareConfiguration().

Author: hbelusca
Date: Thu Jun  1 18:27:41 2017
New Revision: 74733

URL: http://svn.reactos.org/svn/reactos?rev=74733&view=rev
Log:
[NTOS]: Minor code formatting + don't leak a handle in case of failure, in CmpInitializeHardwareConfiguration().

Modified:
    trunk/reactos/ntoskrnl/config/cmconfig.c

Modified: trunk/reactos/ntoskrnl/config/cmconfig.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmconfig.c?...
==============================================================================
--- trunk/reactos/ntoskrnl/config/cmconfig.c	[iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/config/cmconfig.c	[iso-8859-1] Thu Jun  1 18:27:41 2017
@@ -226,23 +226,25 @@
             {
                 /* EISA */
                 case EisaAdapter:
-
+                {
                     /* Fixup information */
                     Interface = Eisa;
                     Bus = CmpTypeCount[EisaAdapter]++;
                     break;
+                }

/* Turbo-channel */
                 case TcAdapter:
-
+                {
                     /* Fixup information */
                     Interface = TurboChannel;
                     Bus = CmpTypeCount[TurboChannel]++;
                     break;
+                }

/* ISA, PCI, etc busses */
                 case MultiFunctionAdapter:
-
+                {
                     /* Check if we have an  identifier */
                     if (Component->Identifier)
                     {
@@ -263,20 +265,24 @@
                         Bus = CmpMultifunctionTypes[i].Count++;
                     }
                     break;
+                }

/* SCSI Bus */
                 case ScsiAdapter:
-
+                {
                     /* Fix up */
                     Interface = Internal;
                     Bus = CmpTypeCount[ScsiAdapter]++;
                     break;
+                }

/* Unknown */
                 default:
+                {
                     Interface = -1;
                     Bus = CmpUnknownBusCount++;
                     break;
+                }
             }
         }

@@ -344,7 +350,8 @@
                          NULL,
                          0,
                          &Disposition);
-    if (!NT_SUCCESS(Status)) return Status;
+    if (!NT_SUCCESS(Status))
+        return Status;
     NtClose(KeyHandle);

/* Nobody should've created this key yet! */
@@ -367,7 +374,8 @@
                           NULL,
                           0,
                           &Disposition);
-    if (!NT_SUCCESS(Status)) return Status;
+    if (!NT_SUCCESS(Status))
+        return Status;

/* Nobody should've created this key yet! */
     ASSERT(Disposition == REG_CREATED_NEW_KEY);
@@ -376,7 +384,11 @@
     CmpConfigurationData = ExAllocatePoolWithTag(PagedPool,
                                                  CmpConfigurationAreaSize,
                                                  TAG_CM);
-    if (!CmpConfigurationData) return STATUS_INSUFFICIENT_RESOURCES;
+    if (!CmpConfigurationData)
+    {
+        NtClose(KeyHandle);
+        return STATUS_INSUFFICIENT_RESOURCES;
+    }

/* Check if we got anything from NTLDR */
     if (LoaderBlock->ConfigurationRoot)
@@ -393,7 +405,7 @@
         Status = STATUS_SUCCESS;
     }

-    /* Close our handle, free the buffer and return status */
+    /* Free the buffer, close our handle and return status */
     ExFreePoolWithTag(CmpConfigurationData, TAG_CM);
     NtClose(KeyHandle);
     return Status;