SF.net SVN: edk2:[15403] trunk/edk2/MdeModulePkg/Universal/DriverSampleDxe/ DriverSample.c

[ydong10]

Revision: 15403
          http://sourceforge.net/p/edk2/code/15403
Author:   ydong10
Date:     2014-03-27 07:08:15 +0000 (Thu, 27 Mar 2014)
Log Message:
-----------
Update code logic, remove ASSERT and use error handling. 

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Eric Dong <eric.d...@intel.com>
Reviewed-by: Liming Gao <liming....@intel.com>

Modified Paths:
--------------
    trunk/edk2/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c

Modified: trunk/edk2/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c
===================================================================
--- trunk/edk2/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c    
2014-03-27 06:02:54 UTC (rev 15402)
+++ trunk/edk2/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c    
2014-03-27 07:08:15 UTC (rev 15403)
@@ -2,7 +2,7 @@
 This is an example of how a driver might export data to the HII protocol to be
 later utilized by the Setup Protocol
 
-Copyright (c) 2004 - 2013, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD 
License
 which accompanies this distribution.  The full text of the license may be 
found at
@@ -1981,25 +1981,40 @@
                     sizeof (DRIVER_SAMPLE_CONFIGURATION),
                     Configuration
                     );
-    ASSERT (Status == EFI_SUCCESS);
+    if (EFI_ERROR (Status)) {
+      DriverSampleUnload (ImageHandle);
+      return Status;
+    }
     //
     // EFI variable for NV config doesn't exit, we should build this variable
     // based on default values stored in IFR
     //
     ActionFlag = HiiSetToDefaults (NameRequestHdr, 
EFI_HII_DEFAULT_CLASS_STANDARD);
-    ASSERT (ActionFlag);
+    if (!ActionFlag) {
+      DriverSampleUnload (ImageHandle);
+      return EFI_INVALID_PARAMETER;
+    }
 
     ActionFlag = HiiSetToDefaults (ConfigRequestHdr, 
EFI_HII_DEFAULT_CLASS_STANDARD);
-    ASSERT (ActionFlag);
+    if (!ActionFlag) {
+      DriverSampleUnload (ImageHandle);
+      return EFI_INVALID_PARAMETER;
+    }
   } else {
     //
     // EFI variable does exist and Validate Current Setting
     //
     ActionFlag = HiiValidateSettings (NameRequestHdr);
-    ASSERT (ActionFlag);
+    if (!ActionFlag) {
+      DriverSampleUnload (ImageHandle);
+      return EFI_INVALID_PARAMETER;
+    }
 
     ActionFlag = HiiValidateSettings (ConfigRequestHdr);
-    ASSERT (ActionFlag);
+    if (!ActionFlag) {
+      DriverSampleUnload (ImageHandle);
+      return EFI_INVALID_PARAMETER;
+    }
   }
   FreePool (ConfigRequestHdr);
 
@@ -2025,19 +2040,28 @@
                     sizeof (MY_EFI_VARSTORE_DATA),
                     VarStoreConfig
                     );
-    ASSERT (Status == EFI_SUCCESS);
+    if (EFI_ERROR (Status)) {
+      DriverSampleUnload (ImageHandle);
+      return Status;
+    }
     //
     // EFI variable for NV config doesn't exit, we should build this variable
     // based on default values stored in IFR
     //
     ActionFlag = HiiSetToDefaults (ConfigRequestHdr, 
EFI_HII_DEFAULT_CLASS_STANDARD);
-    ASSERT (ActionFlag);
+    if (!ActionFlag) {
+      DriverSampleUnload (ImageHandle);
+      return EFI_INVALID_PARAMETER;
+    }
   } else {
     //
     // EFI variable does exist and Validate Current Setting
     //
     ActionFlag = HiiValidateSettings (ConfigRequestHdr);
-    ASSERT (ActionFlag);
+    if (!ActionFlag) {
+      DriverSampleUnload (ImageHandle);
+      return EFI_INVALID_PARAMETER;
+    }
   }
   FreePool (ConfigRequestHdr);
 

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.


------------------------------------------------------------------------------
_______________________________________________
edk2-commits mailing list
edk2-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/edk2-commits