Resolved several warnings generated by GCC.

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

diff --git a/DuetPkg/FSVariable/FSVariable.c b/DuetPkg/FSVariable/FSVariable.c
index 653860f1b2d4b8e1d9f16c8622f49d06eb235bb6..ef762eab468557f3bfeef0830418dd9efee4c6bb 100644 (file)
--- a/DuetPkg/FSVariable/FSVariable.c
+++ b/DuetPkg/FSVariable/FSVariable.c
@@ -292,7 +292,7 @@ Returns:
   Status = gBS->AllocatePool (\r
                   EfiBootServicesData,\r
                   ValidBufferSize,\r
-                  &ValidBuffer\r
+                  (VOID**) &ValidBuffer\r
                   );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
@@ -1134,7 +1134,7 @@ Returns:
   Status = gBS->AllocatePool (\r
                   EfiRuntimeServicesData,\r
                   (UINTN) sizeof (VARIABLE_GLOBAL),\r
-                  &mGlobal\r
+                  (VOID**) &mGlobal\r
                   );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
@@ -1182,7 +1182,7 @@ Returns:
     Status = EFI_UNSUPPORTED;\r
     return Status;\r
   }\r
-  \r
+\r
   Status = FileStorageConstructor (\r
              &mGlobal->VariableStore[NonVolatile], \r
              &mGlobal->GoVirtualChildEvent[NonVolatile],\r
@@ -1307,9 +1307,9 @@ OnVirtualAddressChangeFsv (
 \r
   for (Index = 0; Index < MaxType; Index++) {\r
     mGlobal->GoVirtualChildEvent[Index] (Event, mGlobal->VariableStore[Index]);\r
-    EfiConvertPointer (0, &mGlobal->VariableStore[Index]);\r
+    EfiConvertPointer (0, (VOID**) &mGlobal->VariableStore[Index]);\r
     EfiConvertPointer (0, &mGlobal->VariableBase[Index]);\r
   }\r
   EfiConvertPointer (0, &mGlobal->Scratch);\r
-  EfiConvertPointer (0, &mGlobal);\r
+  EfiConvertPointer (0, (VOID**) &mGlobal);\r
 }\r

diff --git a/DuetPkg/FSVariable/FileStorage.c b/DuetPkg/FSVariable/FileStorage.c
index 2334a16fd2102c3f2b4a90fc703dba55898d90e1..df11ae16b8d11995c4d2f562a04ae881b9058a41 100644 (file)
--- a/DuetPkg/FSVariable/FileStorage.c
+++ b/DuetPkg/FSVariable/FileStorage.c
@@ -154,7 +154,7 @@ CheckStoreExists (
   Status = gBS->HandleProtocol (\r
                   Handle,\r
                   &gEfiSimpleFileSystemProtocolGuid,\r
-                  &Volume\r
+                  (VOID **) &Volume\r
                   );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
@@ -243,7 +243,7 @@ FileStorageConstructor (
   EFI_STATUS                Status;\r
   EFI_EVENT                 Event;\r
 \r
-  Status = gBS->AllocatePool (EfiRuntimeServicesData, sizeof(VS_DEV), &Dev);\r
+  Status = gBS->AllocatePool (EfiRuntimeServicesData, sizeof(VS_DEV), (VOID **) &Dev);\r
   ASSERT_EFI_ERROR (Status);\r
   ZeroMem (Dev, sizeof(VS_DEV));\r
 \r
@@ -361,7 +361,7 @@ OnVirtualAddressChangeFs (
 \r
   Dev = DEV_FROM_THIS (Context);\r
 \r
-  EfiConvertPointer (0, &VAR_DATA_PTR (Dev));\r
+  EfiConvertPointer (0, (VOID **) &VAR_DATA_PTR (Dev));\r
   EfiConvertPointer (0, (VOID **) &Dev->VarStore.Erase);\r
   EfiConvertPointer (0, (VOID **) &Dev->VarStore.Write);\r
 }\r
@@ -394,7 +394,7 @@ OpenStore (
   Status = gBS->HandleProtocol (\r
                   Handle,\r
                   &gEfiSimpleFileSystemProtocolGuid,\r
-                  &Volume\r
+                  (VOID **) &Volume\r
                   );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r

diff --git a/DuetPkg/FSVariable/MemStorage.c b/DuetPkg/FSVariable/MemStorage.c
index 63af149645b7529436423aa6ffdff42a431675b1..cb8c864fce21799802b283e9ab1fba7111936051 100644 (file)
--- a/DuetPkg/FSVariable/MemStorage.c
+++ b/DuetPkg/FSVariable/MemStorage.c
@@ -54,7 +54,7 @@ MemStorageConstructor (
   EFI_STATUS                  Status;\r
   VS_DEV                      *Dev;\r
 \r
-  Status = gBS->AllocatePool (EfiRuntimeServicesData, sizeof(VS_DEV), &Dev);\r
+  Status = gBS->AllocatePool (EfiRuntimeServicesData, sizeof(VS_DEV), (VOID **) &Dev);\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   ZeroMem (Dev, sizeof(VS_DEV));\r
@@ -65,7 +65,7 @@ MemStorageConstructor (
   Dev->VarStore.Erase    = MemEraseStore;\r
   Dev->VarStore.Write    = MemWriteStore;\r
 \r
-  Status = gBS->AllocatePool (EfiRuntimeServicesData, Size, &VAR_DATA_PTR (Dev));\r
+  Status = gBS->AllocatePool (EfiRuntimeServicesData, Size, (VOID **) &VAR_DATA_PTR (Dev));\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   DEBUG ((EFI_D_ERROR, "VStorage: Size = 0x%x\n", Size));\r
@@ -87,9 +87,9 @@ OnVirtualAddressChangeMs (
 \r
   Dev = DEV_FROM_THIS (Context);\r
 \r
-  EfiConvertPointer (0, &VAR_DATA_PTR (Dev));\r
-  EfiConvertPointer (0, (VOID**)&Dev->VarStore.Erase);\r
-  EfiConvertPointer (0, (VOID**)&Dev->VarStore.Write);\r
+  EfiConvertPointer (0, (VOID **)&VAR_DATA_PTR (Dev));\r
+  EfiConvertPointer (0, (VOID **)&Dev->VarStore.Erase);\r
+  EfiConvertPointer (0, (VOID **)&Dev->VarStore.Write);\r
 }\r
 \r
 EFI_STATUS\r