sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ShellPkg: Move SHELL_FREE_NON_NULL from ShellBase.h to ShellLib.h

Browse Source 
The more proper place for macro SHELL_FREE_NON_NULL is ShellLib.h
instead of ShellBase.h.

Modify Compress.c to resolve build failure due to this change.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
This commit is contained in:
Ruiyu Ni
2016-10-14 15:59:53 +08:00
parent d9c2c9540a
commit c6377bfacc
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ShellPkg/Include/Library/ShellLib.h
View File

@ -1,7 +1,7 @@
/** @file /** @file
Provides interface to shell functionality for shell commands and applications. Provides interface to shell functionality for shell commands and applications.
Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR> Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License 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 which accompanies this distribution. The full text of the license may be found at
@ -24,6 +24,14 @@
#include <Protocol/EfiShell.h> #include <Protocol/EfiShell.h>
#include <Protocol/EfiShellParameters.h> #include <Protocol/EfiShellParameters.h>
#define SHELL_FREE_NON_NULL(Pointer) \
do { \
if ((Pointer) != NULL) { \
FreePool((Pointer)); \
(Pointer) = NULL; \
} \
} while(FALSE)
// (20 * (6+5+2))+1) unicode characters from EFI FAT spec (doubled for bytes) // (20 * (6+5+2))+1) unicode characters from EFI FAT spec (doubled for bytes)
#define MAX_FILE_NAME_LEN 512 #define MAX_FILE_NAME_LEN 512

10
ShellPkg/Include/ShellBase.h
View File

@ -1,7 +1,7 @@
/** @file /** @file
Root include file for Shell Package modules that utilize the SHELL_RETURN type Root include file for Shell Package modules that utilize the SHELL_RETURN type
Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR> Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License 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 which accompanies this distribution. The full text of the license may be found at
@ -17,14 +17,6 @@
typedef VOID *SHELL_FILE_HANDLE; typedef VOID *SHELL_FILE_HANDLE;
#define SHELL_FREE_NON_NULL(Pointer) \
do { \
if ((Pointer) != NULL) { \
FreePool((Pointer)); \
(Pointer) = NULL; \
} \
} while(FALSE)
typedef enum { typedef enum {
/// ///
/// The operation completed successfully. /// The operation completed successfully.

8
ShellPkg/Library/UefiShellDebug1CommandsLib/Compress.c
View File

@ -7,7 +7,7 @@
This sequence is further divided into Blocks and Huffman codings This sequence is further divided into Blocks and Huffman codings
are applied to each Block. are applied to each Block.
Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR> Copyright (c) 2007 - 2016, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License 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 which accompanies this distribution. The full text of the license may be found at
@ -17,12 +17,12 @@
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
**/ **/
#include <Uefi.h>
#include <ShellBase.h>
#include <Library/MemoryAllocationLib.h> #include <Library/MemoryAllocationLib.h>
#include <Library/BaseMemoryLib.h> #include <Library/BaseMemoryLib.h>
#include <Library/DebugLib.h> #include <Library/DebugLib.h>
#include <ShellBase.h> #include <Library/ShellLib.h>
#include <Uefi.h>
// //
// Macro Definitions // Macro Definitions