From 7c04a679087c261af74d450f02ea095b2a8d8f91 Mon Sep 17 00:00:00 2001 From: jljusten Date: Sun, 23 Nov 2008 23:57:13 +0000 Subject: [PATCH] Resolved several warnings generated by GCC. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@6685 6f19259b-4bc3-4df7-8a09-765794883524 --- DuetPkg/FSVariable/FSVariable.c | 10 +++++----- DuetPkg/FSVariable/FileStorage.c | 8 ++++---- DuetPkg/FSVariable/MemStorage.c | 10 +++++----- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/DuetPkg/FSVariable/FSVariable.c b/DuetPkg/FSVariable/FSVariable.c index 653860f1b2..ef762eab46 100644 --- a/DuetPkg/FSVariable/FSVariable.c +++ b/DuetPkg/FSVariable/FSVariable.c @@ -292,7 +292,7 @@ Returns: Status = gBS->AllocatePool ( EfiBootServicesData, ValidBufferSize, - &ValidBuffer + (VOID**) &ValidBuffer ); if (EFI_ERROR (Status)) { return Status; @@ -1134,7 +1134,7 @@ Returns: Status = gBS->AllocatePool ( EfiRuntimeServicesData, (UINTN) sizeof (VARIABLE_GLOBAL), - &mGlobal + (VOID**) &mGlobal ); if (EFI_ERROR (Status)) { return Status; @@ -1182,7 +1182,7 @@ Returns: Status = EFI_UNSUPPORTED; return Status; } - + Status = FileStorageConstructor ( &mGlobal->VariableStore[NonVolatile], &mGlobal->GoVirtualChildEvent[NonVolatile], @@ -1307,9 +1307,9 @@ OnVirtualAddressChangeFsv ( for (Index = 0; Index < MaxType; Index++) { mGlobal->GoVirtualChildEvent[Index] (Event, mGlobal->VariableStore[Index]); - EfiConvertPointer (0, &mGlobal->VariableStore[Index]); + EfiConvertPointer (0, (VOID**) &mGlobal->VariableStore[Index]); EfiConvertPointer (0, &mGlobal->VariableBase[Index]); } EfiConvertPointer (0, &mGlobal->Scratch); - EfiConvertPointer (0, &mGlobal); + EfiConvertPointer (0, (VOID**) &mGlobal); } diff --git a/DuetPkg/FSVariable/FileStorage.c b/DuetPkg/FSVariable/FileStorage.c index 2334a16fd2..df11ae16b8 100644 --- a/DuetPkg/FSVariable/FileStorage.c +++ b/DuetPkg/FSVariable/FileStorage.c @@ -154,7 +154,7 @@ CheckStoreExists ( Status = gBS->HandleProtocol ( Handle, &gEfiSimpleFileSystemProtocolGuid, - &Volume + (VOID **) &Volume ); if (EFI_ERROR (Status)) { return Status; @@ -243,7 +243,7 @@ FileStorageConstructor ( EFI_STATUS Status; EFI_EVENT Event; - Status = gBS->AllocatePool (EfiRuntimeServicesData, sizeof(VS_DEV), &Dev); + Status = gBS->AllocatePool (EfiRuntimeServicesData, sizeof(VS_DEV), (VOID **) &Dev); ASSERT_EFI_ERROR (Status); ZeroMem (Dev, sizeof(VS_DEV)); @@ -361,7 +361,7 @@ OnVirtualAddressChangeFs ( Dev = DEV_FROM_THIS (Context); - EfiConvertPointer (0, &VAR_DATA_PTR (Dev)); + EfiConvertPointer (0, (VOID **) &VAR_DATA_PTR (Dev)); EfiConvertPointer (0, (VOID **) &Dev->VarStore.Erase); EfiConvertPointer (0, (VOID **) &Dev->VarStore.Write); } @@ -394,7 +394,7 @@ OpenStore ( Status = gBS->HandleProtocol ( Handle, &gEfiSimpleFileSystemProtocolGuid, - &Volume + (VOID **) &Volume ); if (EFI_ERROR (Status)) { return Status; diff --git a/DuetPkg/FSVariable/MemStorage.c b/DuetPkg/FSVariable/MemStorage.c index 63af149645..cb8c864fce 100644 --- a/DuetPkg/FSVariable/MemStorage.c +++ b/DuetPkg/FSVariable/MemStorage.c @@ -54,7 +54,7 @@ MemStorageConstructor ( EFI_STATUS Status; VS_DEV *Dev; - Status = gBS->AllocatePool (EfiRuntimeServicesData, sizeof(VS_DEV), &Dev); + Status = gBS->AllocatePool (EfiRuntimeServicesData, sizeof(VS_DEV), (VOID **) &Dev); ASSERT_EFI_ERROR (Status); ZeroMem (Dev, sizeof(VS_DEV)); @@ -65,7 +65,7 @@ MemStorageConstructor ( Dev->VarStore.Erase = MemEraseStore; Dev->VarStore.Write = MemWriteStore; - Status = gBS->AllocatePool (EfiRuntimeServicesData, Size, &VAR_DATA_PTR (Dev)); + Status = gBS->AllocatePool (EfiRuntimeServicesData, Size, (VOID **) &VAR_DATA_PTR (Dev)); ASSERT_EFI_ERROR (Status); DEBUG ((EFI_D_ERROR, "VStorage: Size = 0x%x\n", Size)); @@ -87,9 +87,9 @@ OnVirtualAddressChangeMs ( Dev = DEV_FROM_THIS (Context); - EfiConvertPointer (0, &VAR_DATA_PTR (Dev)); - EfiConvertPointer (0, (VOID**)&Dev->VarStore.Erase); - EfiConvertPointer (0, (VOID**)&Dev->VarStore.Write); + EfiConvertPointer (0, (VOID **)&VAR_DATA_PTR (Dev)); + EfiConvertPointer (0, (VOID **)&Dev->VarStore.Erase); + EfiConvertPointer (0, (VOID **)&Dev->VarStore.Write); } EFI_STATUS -- 2.39.2