diff options
| author | Ruiyu Ni <ruiyu.ni@intel.com> | 2016-10-14 15:59:53 +0800 |
|---|---|---|
| committer | Ruiyu Ni <ruiyu.ni@intel.com> | 2016-10-19 10:24:36 +0800 |
| commit | c6377bfaccd51dca6de6468c262cc024e6ab741b (patch) | |
| tree | 31b51d861cff7d9554dd59aa347371f0228d8a90 /ShellPkg/Include | |
| parent | d9c2c9540a95608bc1179b88be90373fb93664a8 (diff) | |
| download | edk2-c6377bfaccd51dca6de6468c262cc024e6ab741b.tar.gz edk2-c6377bfaccd51dca6de6468c262cc024e6ab741b.tar.bz2 edk2-c6377bfaccd51dca6de6468c262cc024e6ab741b.zip | |
ShellPkg: Move SHELL_FREE_NON_NULL from ShellBase.h to ShellLib.h
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>
Diffstat (limited to 'ShellPkg/Include')
| -rw-r--r-- | ShellPkg/Include/Library/ShellLib.h | 10 | ||||
| -rw-r--r-- | ShellPkg/Include/ShellBase.h | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/ShellPkg/Include/Library/ShellLib.h b/ShellPkg/Include/Library/ShellLib.h index fe4b9cf785..fafa041bc7 100644 --- a/ShellPkg/Include/Library/ShellLib.h +++ b/ShellPkg/Include/Library/ShellLib.h @@ -1,7 +1,7 @@ /** @file
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
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
@@ -24,6 +24,14 @@ #include <Protocol/EfiShell.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)
#define MAX_FILE_NAME_LEN 512
diff --git a/ShellPkg/Include/ShellBase.h b/ShellPkg/Include/ShellBase.h index 09f87b4cc0..4b7a3d1e93 100644 --- a/ShellPkg/Include/ShellBase.h +++ b/ShellPkg/Include/ShellBase.h @@ -1,7 +1,7 @@ /** @file
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
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
@@ -17,14 +17,6 @@ typedef VOID *SHELL_FILE_HANDLE;
-#define SHELL_FREE_NON_NULL(Pointer) \
- do { \
- if ((Pointer) != NULL) { \
- FreePool((Pointer)); \
- (Pointer) = NULL; \
- } \
- } while(FALSE)
-
typedef enum {
///
/// The operation completed successfully.
|