Small code refinement in MdeModulePkg.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@10492 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableProtocol.c b/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableProtocol.c
index bd926d3ab7449849b4e5c4aa18f1bc72f76f0e40..23117b1ded24847a05e792f56dfaf0b4fdd9c2e9 100644 (file)
--- a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableProtocol.c
+++ b/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableProtocol.c
@@ -719,61 +719,59 @@ AddTableToList (
       //\r
       // Update pointers in FADT.  If tables don't exist this will put NULL pointers there.\r
       //\r
-      if (AcpiTableInstance->Fadt3 != NULL) {\r
-        AcpiTableInstance->Fadt3->FirmwareCtrl  = (UINT32) (UINTN) AcpiTableInstance->Facs3;\r
-        Buffer64 = (UINT64) (UINTN) AcpiTableInstance->Facs3;\r
-        CopyMem (\r
-          &AcpiTableInstance->Fadt3->XFirmwareCtrl,\r
-          &Buffer64,\r
-          sizeof (UINT64)\r
-          );\r
-        AcpiTableInstance->Fadt3->Dsdt  = (UINT32) (UINTN) AcpiTableInstance->Dsdt3;\r
-        Buffer64                          = (UINT64) (UINTN) AcpiTableInstance->Dsdt3;\r
-        CopyMem (\r
-          &AcpiTableInstance->Fadt3->XDsdt,\r
-          &Buffer64,\r
-          sizeof (UINT64)\r
-          );\r
+      AcpiTableInstance->Fadt3->FirmwareCtrl  = (UINT32) (UINTN) AcpiTableInstance->Facs3;\r
+      Buffer64 = (UINT64) (UINTN) AcpiTableInstance->Facs3;\r
+      CopyMem (\r
+        &AcpiTableInstance->Fadt3->XFirmwareCtrl,\r
+        &Buffer64,\r
+        sizeof (UINT64)\r
+        );\r
+      AcpiTableInstance->Fadt3->Dsdt  = (UINT32) (UINTN) AcpiTableInstance->Dsdt3;\r
+      Buffer64                          = (UINT64) (UINTN) AcpiTableInstance->Dsdt3;\r
+      CopyMem (\r
+        &AcpiTableInstance->Fadt3->XDsdt,\r
+        &Buffer64,\r
+        sizeof (UINT64)\r
+        );\r
 \r
-        //\r
-        // RSDP OEM information is updated to match the FADT OEM information\r
-        //\r
-        CopyMem (\r
-          &AcpiTableInstance->Rsdp3->OemId,\r
-          &AcpiTableInstance->Fadt3->Header.OemId,\r
-          6\r
-          );\r
-        \r
-        //\r
-        // RSDT OEM information is updated to match FADT OEM information.\r
-        //\r
-        CopyMem (\r
-          &AcpiTableInstance->Rsdt3->OemId,\r
-          &AcpiTableInstance->Fadt3->Header.OemId,\r
-          6\r
-          );\r
-        CopyMem (\r
-          &AcpiTableInstance->Rsdt3->OemTableId,\r
-          &AcpiTableInstance->Fadt3->Header.OemTableId,\r
-          sizeof (UINT64)\r
-          );\r
-        AcpiTableInstance->Rsdt3->OemRevision = AcpiTableInstance->Fadt3->Header.OemRevision;\r
-        \r
-        //\r
-        // XSDT OEM information is updated to match FADT OEM information.\r
-        //\r
-        CopyMem (\r
-          &AcpiTableInstance->Xsdt->OemId,\r
-          &AcpiTableInstance->Fadt3->Header.OemId,\r
-          6\r
-          );\r
-        CopyMem (\r
-          &AcpiTableInstance->Xsdt->OemTableId,\r
-          &AcpiTableInstance->Fadt3->Header.OemTableId,\r
-          sizeof (UINT64)\r
-          );\r
-        AcpiTableInstance->Xsdt->OemRevision = AcpiTableInstance->Fadt3->Header.OemRevision;\r
-      }\r
+      //\r
+      // RSDP OEM information is updated to match the FADT OEM information\r
+      //\r
+      CopyMem (\r
+        &AcpiTableInstance->Rsdp3->OemId,\r
+        &AcpiTableInstance->Fadt3->Header.OemId,\r
+        6\r
+        );\r
+      \r
+      //\r
+      // RSDT OEM information is updated to match FADT OEM information.\r
+      //\r
+      CopyMem (\r
+        &AcpiTableInstance->Rsdt3->OemId,\r
+        &AcpiTableInstance->Fadt3->Header.OemId,\r
+        6\r
+        );\r
+      CopyMem (\r
+        &AcpiTableInstance->Rsdt3->OemTableId,\r
+        &AcpiTableInstance->Fadt3->Header.OemTableId,\r
+        sizeof (UINT64)\r
+        );\r
+      AcpiTableInstance->Rsdt3->OemRevision = AcpiTableInstance->Fadt3->Header.OemRevision;\r
+      \r
+      //\r
+      // XSDT OEM information is updated to match FADT OEM information.\r
+      //\r
+      CopyMem (\r
+        &AcpiTableInstance->Xsdt->OemId,\r
+        &AcpiTableInstance->Fadt3->Header.OemId,\r
+        6\r
+        );\r
+      CopyMem (\r
+        &AcpiTableInstance->Xsdt->OemTableId,\r
+        &AcpiTableInstance->Fadt3->Header.OemTableId,\r
+        sizeof (UINT64)\r
+        );\r
+      AcpiTableInstance->Xsdt->OemRevision = AcpiTableInstance->Fadt3->Header.OemRevision;\r
     }    \r
     //\r
     // Checksum the table\r

diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/Vtutf8.c b/MdeModulePkg/Universal/Console/TerminalDxe/Vtutf8.c
index 51cc093a41ad7b4ada7051e095609441e94da525..26fc13147a040aaf255dda636f3c145aac73da20 100644 (file)
--- a/MdeModulePkg/Universal/Console/TerminalDxe/Vtutf8.c
+++ b/MdeModulePkg/Universal/Console/TerminalDxe/Vtutf8.c
@@ -1,7 +1,7 @@
 /** @file\r
   Implementation of translation upon VT-UTF8.\r
 \r
-Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
@@ -145,10 +145,11 @@ GetOneValidUtf8Char (
       // three-byte utf8 char go on\r
       //\r
       if ((Temp & 0xc0) == 0x80) {\r
-\r
-        Utf8Char->Utf8_3[2 - Index] = Temp;\r
-        Index++;\r
-        if (Index > 2) {\r
+        if (Index == 1) {\r
+          Utf8Char->Utf8_3[1] = Temp;\r
+          Index++;\r
+        } else {\r
+          Utf8Char->Utf8_3[0] = Temp;\r
           FetchFlag = FALSE;\r
         }\r
       } else {\r

diff --git a/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c b/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c
index ff9e4b21799ad864f3f5b01f0a17956f993feb1c..e490ca45d831dd61ddd2cf2c11b12f40f21b2447 100644 (file)
--- a/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c
+++ b/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c
@@ -1433,6 +1433,9 @@ DriverSampleUnload (
   )\r
 {\r
   UINTN Index;\r
+\r
+  ASSERT (PrivateData != NULL);\r
+\r
   if (DriverHandle[0] != NULL) {\r
     gBS->UninstallMultipleProtocolInterfaces (\r
             DriverHandle[0],\r
@@ -1463,15 +1466,13 @@ DriverSampleUnload (
     HiiRemovePackages (PrivateData->HiiHandle[1]);\r
   }\r
 \r
-  if (PrivateData != NULL) {\r
-    for (Index = 0; Index < NAME_VALUE_NAME_NUMBER; Index++) {\r
-      if (PrivateData->NameValueName[Index] != NULL) {\r
-        FreePool (PrivateData->NameValueName[Index]);\r
-      }\r
+  for (Index = 0; Index < NAME_VALUE_NAME_NUMBER; Index++) {\r
+    if (PrivateData->NameValueName[Index] != NULL) {\r
+      FreePool (PrivateData->NameValueName[Index]);\r
     }\r
-    FreePool (PrivateData);\r
-    PrivateData = NULL;\r
   }\r
+  FreePool (PrivateData);\r
+  PrivateData = NULL;\r
 \r
   return EFI_SUCCESS;\r
 }\r

diff --git a/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatDriOverrideDxe.c b/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatDriOverrideDxe.c
index 38812f92f23eeed981486bf191591ac1b6cf1273..1e5481ef725e6311cb6018fb82692daa1ece6432 100644 (file)
--- a/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatDriOverrideDxe.c
+++ b/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatDriOverrideDxe.c
@@ -1654,26 +1654,7 @@ PlatDriOverrideDxeInit (
   return EFI_SUCCESS;\r
 \r
 Finish:\r
-  if (mCallbackInfo->DriverHandle != NULL) {\r
-    gBS->UninstallMultipleProtocolInterfaces (\r
-           mCallbackInfo->DriverHandle,\r
-           &gEfiDevicePathProtocolGuid,\r
-           &mHiiVendorDevicePath,\r
-           &gEfiHiiConfigAccessProtocolGuid,\r
-           &mCallbackInfo->ConfigAccess,\r
-           &gEfiPlatformDriverOverrideProtocolGuid,\r
-           &mCallbackInfo->PlatformDriverOverride,\r
-           NULL\r
-           );\r
-  }\r
-  \r
-  if (mCallbackInfo->RegisteredHandle != NULL) {\r
-    HiiRemovePackages (mCallbackInfo->RegisteredHandle);\r
-  }\r
-\r
-  if (mCallbackInfo != NULL) {\r
-    FreePool (mCallbackInfo);\r
-  }\r
+  PlatDriOverrideDxeUnload (ImageHandle);\r
 \r
   return Status;\r
 }\r
@@ -1691,6 +1672,8 @@ PlatDriOverrideDxeUnload (
   IN EFI_HANDLE  ImageHandle\r
   )\r
 {\r
+  ASSERT (mCallbackInfo != NULL);\r
+\r
   if (mCallbackInfo->DriverHandle != NULL) {\r
     gBS->UninstallMultipleProtocolInterfaces (\r
            mCallbackInfo->DriverHandle,\r
@@ -1708,9 +1691,7 @@ PlatDriOverrideDxeUnload (
     HiiRemovePackages (mCallbackInfo->RegisteredHandle);\r
   }\r
 \r
-  if (mCallbackInfo != NULL) {\r
-    FreePool (mCallbackInfo);\r
-  }\r
+  FreePool (mCallbackInfo);\r
 \r
   return EFI_SUCCESS;\r
 }\r