Revision: 18466
http://sourceforge.net/p/edk2/code/18466
Author: hwu1225
Date: 2015-09-15 05:45:27 +0000 (Tue, 15 Sep 2015)
Log Message:
-----------
ShellPkg: Rename some functions in Dp to avoid build errors.
There are other libraries with similarly named functions that could be linked
with the Shell
(Sync patch r18456 from main trunk.)
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Samer El-Haj-Mahmoud <[email protected]>
Reviewed-by: Jaben Carsey <[email protected]>
Reviewed-by: Qiu Shumin <[email protected]>
Revision Links:
--------------
http://sourceforge.net/p/edk2/code/18456
Modified Paths:
--------------
branches/UDK2015/ShellPkg/Library/UefiDpLib/DpInternal.h
branches/UDK2015/ShellPkg/Library/UefiDpLib/DpTrace.c
branches/UDK2015/ShellPkg/Library/UefiDpLib/DpUtilities.c
Modified: branches/UDK2015/ShellPkg/Library/UefiDpLib/DpInternal.h
===================================================================
--- branches/UDK2015/ShellPkg/Library/UefiDpLib/DpInternal.h 2015-09-15
05:45:03 UTC (rev 18465)
+++ branches/UDK2015/ShellPkg/Library/UefiDpLib/DpInternal.h 2015-09-15
05:45:27 UTC (rev 18466)
@@ -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 @@
**/
VOID
-GetShortPdbFileName (
+DpGetShortPdbFileName (
IN CHAR8 *PdbFileName,
OUT CHAR16 *UnicodeBuffer
);
@@ -118,7 +119,7 @@
**/
VOID
-GetNameFromHandle (
+DpGetNameFromHandle (
IN EFI_HANDLE Handle
);
Modified: branches/UDK2015/ShellPkg/Library/UefiDpLib/DpTrace.c
===================================================================
--- branches/UDK2015/ShellPkg/Library/UefiDpLib/DpTrace.c 2015-09-15
05:45:03 UTC (rev 18465)
+++ branches/UDK2015/ShellPkg/Library/UefiDpLib/DpTrace.c 2015-09-15
05:45:27 UTC (rev 18466)
@@ -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 @@
// 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 @@
// 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;
}
}
Modified: branches/UDK2015/ShellPkg/Library/UefiDpLib/DpUtilities.c
===================================================================
--- branches/UDK2015/ShellPkg/Library/UefiDpLib/DpUtilities.c 2015-09-15
05:45:03 UTC (rev 18465)
+++ branches/UDK2015/ShellPkg/Library/UefiDpLib/DpUtilities.c 2015-09-15
05:45:27 UTC (rev 18466)
@@ -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 @@
**/
VOID
-GetShortPdbFileName (
+DpGetShortPdbFileName (
IN CHAR8 *PdbFileName,
OUT CHAR16 *UnicodeBuffer
)
@@ -188,7 +189,7 @@
**/
VOID
-GetNameFromHandle (
+DpGetNameFromHandle (
IN EFI_HANDLE Handle
)
{
@@ -236,7 +237,7 @@
PdbFileName = PeCoffLoaderGetPdbPointer (Image->ImageBase);
if (PdbFileName != NULL) {
- GetShortPdbFileName (PdbFileName, mGaugeString);
+ DpGetShortPdbFileName (PdbFileName, mGaugeString);
return;
}
}
------------------------------------------------------------------------------
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits
