tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MdeModulePkg: Fix VS2015 warning C4459 in DriverSampleDxe 

warning C4459: declaration of 'PrivateData' hides global declaration.
Update DriverSampleDxe to rename global variable name to be different.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Liming Gao <liming.gao@intel.com>
Reviewed-by: Michael Kinney <michael.d.kinney@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@19112 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
Liming Gao 2015-12-04 03:06:07 +00:00 committed by lgao4
parent 592a3790d8
commit 7b2c31ae65
1 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c
View File

@ -21,7 +21,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
CHAR16 VariableName[] = L"MyIfrNVData"; CHAR16 VariableName[] = L"MyIfrNVData";
CHAR16 MyEfiVar[] = L"MyEfiVar"; CHAR16 MyEfiVar[] = L"MyEfiVar";
EFI_HANDLE DriverHandle[2] = {NULL, NULL}; EFI_HANDLE DriverHandle[2] = {NULL, NULL};
DRIVER_SAMPLE_PRIVATE_DATA *PrivateData = NULL; DRIVER_SAMPLE_PRIVATE_DATA *mPrivateData = NULL;
EFI_EVENT mEvent; EFI_EVENT mEvent;
HII_VENDOR_DEVICE_PATH mHiiVendorDevicePath0 = { HII_VENDOR_DEVICE_PATH mHiiVendorDevicePath0 = {
@ -1895,17 +1895,17 @@ DriverSampleInit (
// //
// Initialize driver private data // Initialize driver private data
// //
PrivateData = AllocateZeroPool (sizeof (DRIVER_SAMPLE_PRIVATE_DATA)); mPrivateData = AllocateZeroPool (sizeof (DRIVER_SAMPLE_PRIVATE_DATA));
if (PrivateData == NULL) { if (mPrivateData == NULL) {
return EFI_OUT_OF_RESOURCES; return EFI_OUT_OF_RESOURCES;
} }
PrivateData->Signature = DRIVER_SAMPLE_PRIVATE_SIGNATURE; mPrivateData->Signature = DRIVER_SAMPLE_PRIVATE_SIGNATURE;
PrivateData->ConfigAccess.ExtractConfig = ExtractConfig; mPrivateData->ConfigAccess.ExtractConfig = ExtractConfig;
PrivateData->ConfigAccess.RouteConfig = RouteConfig; mPrivateData->ConfigAccess.RouteConfig = RouteConfig;
PrivateData->ConfigAccess.Callback = DriverCallback; mPrivateData->ConfigAccess.Callback = DriverCallback;
PrivateData->PasswordState = BROWSER_STATE_VALIDATE_PASSWORD; mPrivateData->PasswordState = BROWSER_STATE_VALIDATE_PASSWORD;
// //
// Locate Hii Database protocol // Locate Hii Database protocol
@ -1914,7 +1914,7 @@ DriverSampleInit (
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
return Status; return Status;
} }
PrivateData->HiiDatabase = HiiDatabase; mPrivateData->HiiDatabase = HiiDatabase;
// //
// Locate HiiString protocol // Locate HiiString protocol
@ -1923,7 +1923,7 @@ DriverSampleInit (
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
return Status; return Status;
} }
PrivateData->HiiString = HiiString; mPrivateData->HiiString = HiiString;
// //
// Locate Formbrowser2 protocol // Locate Formbrowser2 protocol
@ -1932,7 +1932,7 @@ DriverSampleInit (
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
return Status; return Status;
} }
PrivateData->FormBrowser2 = FormBrowser2; mPrivateData->FormBrowser2 = FormBrowser2;
// //
// Locate ConfigRouting protocol // Locate ConfigRouting protocol
@ -1941,7 +1941,7 @@ DriverSampleInit (
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
return Status; return Status;
} }
PrivateData->HiiConfigRouting = HiiConfigRouting; mPrivateData->HiiConfigRouting = HiiConfigRouting;
// //
// Locate keyword handler protocol // Locate keyword handler protocol
@ -1950,19 +1950,19 @@ DriverSampleInit (
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
return Status; return Status;
} }
PrivateData->HiiKeywordHandler = HiiKeywordHandler; mPrivateData->HiiKeywordHandler = HiiKeywordHandler;
Status = gBS->InstallMultipleProtocolInterfaces ( Status = gBS->InstallMultipleProtocolInterfaces (
&DriverHandle[0], &DriverHandle[0],
&gEfiDevicePathProtocolGuid, &gEfiDevicePathProtocolGuid,
&mHiiVendorDevicePath0, &mHiiVendorDevicePath0,
&gEfiHiiConfigAccessProtocolGuid, &gEfiHiiConfigAccessProtocolGuid,
&PrivateData->ConfigAccess, &mPrivateData->ConfigAccess,
NULL NULL
); );
ASSERT_EFI_ERROR (Status); ASSERT_EFI_ERROR (Status);
PrivateData->DriverHandle[0] = DriverHandle[0]; mPrivateData->DriverHandle[0] = DriverHandle[0];
// //
// Publish our HII data // Publish our HII data
@ -1978,7 +1978,7 @@ DriverSampleInit (
return EFI_OUT_OF_RESOURCES; return EFI_OUT_OF_RESOURCES;
} }
PrivateData->HiiHandle[0] = HiiHandle[0]; mPrivateData->HiiHandle[0] = HiiHandle[0];
// //
// Publish another Fromset // Publish another Fromset
@ -1988,12 +1988,12 @@ DriverSampleInit (
&gEfiDevicePathProtocolGuid, &gEfiDevicePathProtocolGuid,
&mHiiVendorDevicePath1, &mHiiVendorDevicePath1,
&gEfiHiiConfigAccessProtocolGuid, &gEfiHiiConfigAccessProtocolGuid,
&PrivateData->ConfigAccess, &mPrivateData->ConfigAccess,
NULL NULL
); );
ASSERT_EFI_ERROR (Status); ASSERT_EFI_ERROR (Status);
PrivateData->DriverHandle[1] = DriverHandle[1]; mPrivateData->DriverHandle[1] = DriverHandle[1];
HiiHandle[1] = HiiAddPackages ( HiiHandle[1] = HiiAddPackages (
&gDriverSampleInventoryGuid, &gDriverSampleInventoryGuid,
@ -2007,7 +2007,7 @@ DriverSampleInit (
return EFI_OUT_OF_RESOURCES; return EFI_OUT_OF_RESOURCES;
} }
PrivateData->HiiHandle[1] = HiiHandle[1]; mPrivateData->HiiHandle[1] = HiiHandle[1];
// //
// Update the device path string. // Update the device path string.
@ -2037,14 +2037,14 @@ DriverSampleInit (
// //
// Initialize Name/Value name String ID // Initialize Name/Value name String ID
// //
PrivateData->NameStringId[0] = STR_NAME_VALUE_VAR_NAME0; mPrivateData->NameStringId[0] = STR_NAME_VALUE_VAR_NAME0;
PrivateData->NameStringId[1] = STR_NAME_VALUE_VAR_NAME1; mPrivateData->NameStringId[1] = STR_NAME_VALUE_VAR_NAME1;
PrivateData->NameStringId[2] = STR_NAME_VALUE_VAR_NAME2; mPrivateData->NameStringId[2] = STR_NAME_VALUE_VAR_NAME2;
// //
// Initialize configuration data // Initialize configuration data
// //
Configuration = &PrivateData->Configuration; Configuration = &mPrivateData->Configuration;
ZeroMem (Configuration, sizeof (DRIVER_SAMPLE_CONFIGURATION)); ZeroMem (Configuration, sizeof (DRIVER_SAMPLE_CONFIGURATION));
// //
@ -2109,7 +2109,7 @@ DriverSampleInit (
// //
// Initialize efi varstore configuration data // Initialize efi varstore configuration data
// //
VarStoreConfig = &PrivateData->VarStoreConfig; VarStoreConfig = &mPrivateData->VarStoreConfig;
ZeroMem (VarStoreConfig, sizeof (MY_EFI_VARSTORE_DATA)); ZeroMem (VarStoreConfig, sizeof (MY_EFI_VARSTORE_DATA));
ConfigRequestHdr = HiiConstructConfigHdr (&gDriverSampleFormSetGuid, MyEfiVar, DriverHandle[0]); ConfigRequestHdr = HiiConstructConfigHdr (&gDriverSampleFormSetGuid, MyEfiVar, DriverHandle[0]);
@ -2181,11 +2181,11 @@ DriverSampleInit (
// Register the default HotKey F9 and F10 again. // Register the default HotKey F9 and F10 again.
// //
HotKey.ScanCode = SCAN_F10; HotKey.ScanCode = SCAN_F10;
NewString = HiiGetString (PrivateData->HiiHandle[0], STRING_TOKEN (FUNCTION_TEN_STRING), NULL); NewString = HiiGetString (mPrivateData->HiiHandle[0], STRING_TOKEN (FUNCTION_TEN_STRING), NULL);
ASSERT (NewString != NULL); ASSERT (NewString != NULL);
FormBrowserEx->RegisterHotKey (&HotKey, BROWSER_ACTION_SUBMIT, 0, NewString); FormBrowserEx->RegisterHotKey (&HotKey, BROWSER_ACTION_SUBMIT, 0, NewString);
HotKey.ScanCode = SCAN_F9; HotKey.ScanCode = SCAN_F9;
NewString = HiiGetString (PrivateData->HiiHandle[0], STRING_TOKEN (FUNCTION_NINE_STRING), NULL); NewString = HiiGetString (mPrivateData->HiiHandle[0], STRING_TOKEN (FUNCTION_NINE_STRING), NULL);
ASSERT (NewString != NULL); ASSERT (NewString != NULL);
FormBrowserEx->RegisterHotKey (&HotKey, BROWSER_ACTION_DEFAULT, EFI_HII_DEFAULT_CLASS_STANDARD, NewString); FormBrowserEx->RegisterHotKey (&HotKey, BROWSER_ACTION_DEFAULT, EFI_HII_DEFAULT_CLASS_STANDARD, NewString);
} }
@ -2237,7 +2237,7 @@ DriverSampleUnload (
{ {
UINTN Index; UINTN Index;
ASSERT (PrivateData != NULL); ASSERT (mPrivateData != NULL);
if (DriverHandle[0] != NULL) { if (DriverHandle[0] != NULL) {
gBS->UninstallMultipleProtocolInterfaces ( gBS->UninstallMultipleProtocolInterfaces (
@ -2245,7 +2245,7 @@ DriverSampleUnload (
&gEfiDevicePathProtocolGuid, &gEfiDevicePathProtocolGuid,
&mHiiVendorDevicePath0, &mHiiVendorDevicePath0,
&gEfiHiiConfigAccessProtocolGuid, &gEfiHiiConfigAccessProtocolGuid,
&PrivateData->ConfigAccess, &mPrivateData->ConfigAccess,
NULL NULL
); );
DriverHandle[0] = NULL; DriverHandle[0] = NULL;
@ -2261,21 +2261,21 @@ DriverSampleUnload (
DriverHandle[1] = NULL; DriverHandle[1] = NULL;
} }
if (PrivateData->HiiHandle[0] != NULL) { if (mPrivateData->HiiHandle[0] != NULL) {
HiiRemovePackages (PrivateData->HiiHandle[0]); HiiRemovePackages (mPrivateData->HiiHandle[0]);
} }
if (PrivateData->HiiHandle[1] != NULL) { if (mPrivateData->HiiHandle[1] != NULL) {
HiiRemovePackages (PrivateData->HiiHandle[1]); HiiRemovePackages (mPrivateData->HiiHandle[1]);
} }
for (Index = 0; Index < NAME_VALUE_NAME_NUMBER; Index++) { for (Index = 0; Index < NAME_VALUE_NAME_NUMBER; Index++) {
if (PrivateData->NameValueName[Index] != NULL) { if (mPrivateData->NameValueName[Index] != NULL) {
FreePool (PrivateData->NameValueName[Index]); FreePool (mPrivateData->NameValueName[Index]);
} }
} }
FreePool (PrivateData); FreePool (mPrivateData);
PrivateData = NULL; mPrivateData = NULL;
gBS->CloseEvent (mEvent); gBS->CloseEvent (mEvent);