Reviewed-by: Jaben Carsey <[email protected]> > -----Original Message----- > From: Samer El-Haj-Mahmoud [mailto:[email protected]] > Sent: Friday, September 11, 2015 4:53 PM > To: [email protected] > Cc: Samer El-Haj-Mahmoud <[email protected]>; Carsey, > Jaben <[email protected]> > Subject: [PATCH] ShellPkg: Rename some functions in Dp to avoid build > errors > Importance: High > > There are other libraries with similarly named functions that could be linked > with the Shell > > Signed-off-by: Samer El-Haj-Mahmoud <[email protected]> > Cc: Jaben Carsey <[email protected]> > --- > ShellPkg/Library/UefiDpLib/DpInternal.h | 5 +++-- > ShellPkg/Library/UefiDpLib/DpTrace.c | 5 +++-- > ShellPkg/Library/UefiDpLib/DpUtilities.c | 7 ++++--- > 3 files changed, 10 insertions(+), 7 deletions(-) > > diff --git a/ShellPkg/Library/UefiDpLib/DpInternal.h > b/ShellPkg/Library/UefiDpLib/DpInternal.h > index c7d9a59..22dc4f9 100644 > --- a/ShellPkg/Library/UefiDpLib/DpInternal.h > +++ b/ShellPkg/Library/UefiDpLib/DpInternal.h > @@ -7,6 +7,7 @@ > DpUtilities.c, DpTrace.c, and DpProfile.c are included here. > > Copyright (c) 2009 - 2013, Intel Corporation. All rights reserved. > + (C) Copyright 2015 Hewlett Packard Enterprise Development LP<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 > @@ -96,7 +97,7 @@ IsPhase( > > **/ > VOID > -GetShortPdbFileName ( > +DpGetShortPdbFileName ( > IN CHAR8 *PdbFileName, > OUT CHAR16 *UnicodeBuffer > ); > @@ -118,7 +119,7 @@ GetShortPdbFileName ( > > **/ > VOID > -GetNameFromHandle ( > +DpGetNameFromHandle ( > IN EFI_HANDLE Handle > ); > > diff --git a/ShellPkg/Library/UefiDpLib/DpTrace.c > b/ShellPkg/Library/UefiDpLib/DpTrace.c > index de1d45a..542fcc8 100644 > --- a/ShellPkg/Library/UefiDpLib/DpTrace.c > +++ b/ShellPkg/Library/UefiDpLib/DpTrace.c > @@ -2,6 +2,7 @@ > Trace reporting for the Dp utility. > > Copyright (c) 2009 - 2013, Intel Corporation. All rights reserved. > + (C) Copyright 2015 Hewlett Packard Enterprise Development LP<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 > @@ -216,7 +217,7 @@ DumpAllTrace( > // See if the Handle is in the HandleBuffer > for (TIndex = 0; TIndex < (Size / sizeof(HandleBuffer[0])); > TIndex++) { > if (Measurement.Handle == HandleBuffer[TIndex]) { > - GetNameFromHandle (HandleBuffer[TIndex]); > + DpGetNameFromHandle (HandleBuffer[TIndex]); > break; > } > } > @@ -582,7 +583,7 @@ ProcessHandles( > // See if the Handle is in the HandleBuffer > for (Index = 0; Index < (Size / sizeof(HandleBuffer[0])); Index++) { > if (Measurement.Handle == HandleBuffer[Index]) { > - GetNameFromHandle (HandleBuffer[Index]); // Name is put into > mGaugeString > + DpGetNameFromHandle (HandleBuffer[Index]); // Name is put into > mGaugeString > break; > } > } > diff --git a/ShellPkg/Library/UefiDpLib/DpUtilities.c > b/ShellPkg/Library/UefiDpLib/DpUtilities.c > index 063eb65..c464c2f 100644 > --- a/ShellPkg/Library/UefiDpLib/DpUtilities.c > +++ b/ShellPkg/Library/UefiDpLib/DpUtilities.c > @@ -2,6 +2,7 @@ > Utility functions used by the Dp application. > > Copyright (c) 2009 - 2015, Intel Corporation. All rights reserved. > + (C) Copyright 2015 Hewlett Packard Enterprise Development LP<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 > @@ -131,7 +132,7 @@ IsPhase( > > **/ > VOID > -GetShortPdbFileName ( > +DpGetShortPdbFileName ( > IN CHAR8 *PdbFileName, > OUT CHAR16 *UnicodeBuffer > ) > @@ -188,7 +189,7 @@ GetShortPdbFileName ( > > **/ > VOID > -GetNameFromHandle ( > +DpGetNameFromHandle ( > IN EFI_HANDLE Handle > ) > { > @@ -236,7 +237,7 @@ GetNameFromHandle ( > PdbFileName = PeCoffLoaderGetPdbPointer (Image->ImageBase); > > if (PdbFileName != NULL) { > - GetShortPdbFileName (PdbFileName, mGaugeString); > + DpGetShortPdbFileName (PdbFileName, mGaugeString); > return; > } > } > -- > 1.9.5.msysgit.1
_______________________________________________ edk2-devel mailing list [email protected] https://lists.01.org/mailman/listinfo/edk2-devel
