ShellPkg/ConsistMapping: Remove unneeded memory reallocation

[edk2] [PATCH] ShellPkg/ConsistMapping: Remove unneeded memory reallocation

Posted by Ruiyu Ni 7 years, 6 months ago

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
Cc: Michael Turner <Michael.Turner@microsoft.com>
Cc: Jaben Carsey <jaben.carsey@intel.com>
---
 ShellPkg/Library/UefiShellCommandLib/ConsistMapping.c | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/ShellPkg/Library/UefiShellCommandLib/ConsistMapping.c b/ShellPkg/Library/UefiShellCommandLib/ConsistMapping.c
index 09f2c56..3b13e62 100755
--- a/ShellPkg/Library/UefiShellCommandLib/ConsistMapping.c
+++ b/ShellPkg/Library/UefiShellCommandLib/ConsistMapping.c
@@ -1,7 +1,7 @@
 /** @file
   Main file for support of shell consist mapping.
 
-  Copyright (c) 2005 - 2016, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2005 - 2017, 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
@@ -1610,7 +1610,6 @@ ShellCommandConsistMappingGenMappingName (
   DEVICE_CONSIST_MAPPING_INFO MappingInfo;
   EFI_DEVICE_PATH_PROTOCOL    *HIDevicePath;
   UINTN                       Index;
-  CHAR16                      *NewStr;
 
   ASSERT(DevicePath         != NULL);
   ASSERT(Table  != NULL);
@@ -1667,13 +1666,7 @@ ShellCommandConsistMappingGenMappingName (
     return NULL;
   }
 
-  NewStr = ReallocatePool (Str.Len * sizeof (CHAR16), (Str.Len + 1) * sizeof (CHAR16), Str.Str);
-  if (NewStr == NULL) {
-    SHELL_FREE_NON_NULL (Str.Str);
-    return (NULL);
-  }
-  NewStr[Str.Len] = CHAR_NULL;
-  return NewStr;
+  return Str.Str;
 }
 
 /**
-- 
2.9.0.windows.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Re: [edk2] [PATCH] ShellPkg/ConsistMapping: Remove unneeded memory reallocation

Posted by Carsey, Jaben 7 years, 6 months ago

Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>

> -----Original Message-----
> From: Ni, Ruiyu
> Sent: Sunday, April 16, 2017 11:29 PM
> To: edk2-devel@lists.01.org
> Cc: Michael Turner <Michael.Turner@microsoft.com>; Carsey, Jaben
> <jaben.carsey@intel.com>
> Subject: [PATCH] ShellPkg/ConsistMapping: Remove unneeded memory
> reallocation
> Importance: High
> 
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
> Cc: Michael Turner <Michael.Turner@microsoft.com>
> Cc: Jaben Carsey <jaben.carsey@intel.com>
> ---
>  ShellPkg/Library/UefiShellCommandLib/ConsistMapping.c | 11 ++---------
>  1 file changed, 2 insertions(+), 9 deletions(-)
> 
> diff --git a/ShellPkg/Library/UefiShellCommandLib/ConsistMapping.c
> b/ShellPkg/Library/UefiShellCommandLib/ConsistMapping.c
> index 09f2c56..3b13e62 100755
> --- a/ShellPkg/Library/UefiShellCommandLib/ConsistMapping.c
> +++ b/ShellPkg/Library/UefiShellCommandLib/ConsistMapping.c
> @@ -1,7 +1,7 @@
>  /** @file
>    Main file for support of shell consist mapping.
> 
> -  Copyright (c) 2005 - 2016, Intel Corporation. All rights reserved.<BR>
> +  Copyright (c) 2005 - 2017, 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 @@ -1610,7 +1610,6 @@ ShellCommandConsistMappingGenMappingName (
>    DEVICE_CONSIST_MAPPING_INFO MappingInfo;
>    EFI_DEVICE_PATH_PROTOCOL    *HIDevicePath;
>    UINTN                       Index;
> -  CHAR16                      *NewStr;
> 
>    ASSERT(DevicePath         != NULL);
>    ASSERT(Table  != NULL);
> @@ -1667,13 +1666,7 @@ ShellCommandConsistMappingGenMappingName (
>      return NULL;
>    }
> 
> -  NewStr = ReallocatePool (Str.Len * sizeof (CHAR16), (Str.Len + 1) * sizeof
> (CHAR16), Str.Str);
> -  if (NewStr == NULL) {
> -    SHELL_FREE_NON_NULL (Str.Str);
> -    return (NULL);
> -  }
> -  NewStr[Str.Len] = CHAR_NULL;
> -  return NewStr;
> +  return Str.Str;
>  }
> 
>  /**
> --
> 2.9.0.windows.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel