commit cb4669e05132a6069cdfc1056e03190732b714a0
author Laszlo Ersek <lersek@redhat.com> Wed Oct 26 19:27:30 2016 +0200
committer Laszlo Ersek <lersek@redhat.com> Thu Oct 27 11:15:20 2016 +0200
tree d82797d451ad2ef19ef0184894c2b5bed9554640
parent 3318f89344a35539dac0fe7090fc44faf172dc15

ShellPkg/UefiDpLib: rebase to ARRAY_SIZE()

Cc: Jaben Carsey <jaben.carsey@intel.com>
Cc: Ruiyu Ni <ruiyu.ni@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Ruiyu Ni <ruiyu.ni@intel.com>
Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>

ShellPkg/Library/UefiDpLib/DpTrace.c

diff --git a/ShellPkg/Library/UefiDpLib/DpTrace.c b/ShellPkg/Library/UefiDpLib/DpTrace.c
index f3f781f..eca2ef3 100644
--- a/ShellPkg/Library/UefiDpLib/DpTrace.c
+++ b/ShellPkg/Library/UefiDpLib/DpTrace.c
@@ -220,8 +220,8 @@
       ++Count;    // Count the number of records printed

 

       // If Handle is non-zero, see if we can determine a name for the driver

-      AsciiStrToUnicodeStrS (Measurement.Module, mGaugeString, sizeof (mGaugeString) / sizeof (mGaugeString[0])); // Use Module by default

-      AsciiStrToUnicodeStrS (Measurement.Token, mUnicodeToken, sizeof (mUnicodeToken) / sizeof (mUnicodeToken[0]));

+      AsciiStrToUnicodeStrS (Measurement.Module, mGaugeString, ARRAY_SIZE (mGaugeString)); // Use Module by default

+      AsciiStrToUnicodeStrS (Measurement.Token, mUnicodeToken, ARRAY_SIZE (mUnicodeToken));

       if (Measurement.Handle != NULL) {

         // See if the Handle is in the HandleBuffer

         for (TIndex = 0; TIndex < HandleCount; TIndex++) {

@@ -595,7 +595,7 @@
         continue;

       }

       mGaugeString[0] = 0;    // Empty driver name by default

-      AsciiStrToUnicodeStrS (Measurement.Token, mUnicodeToken, sizeof (mUnicodeToken) / sizeof (mUnicodeToken[0]));

+      AsciiStrToUnicodeStrS (Measurement.Token, mUnicodeToken, ARRAY_SIZE (mUnicodeToken));

       // See if the Handle is in the HandleBuffer

       for (Index = 0; Index < HandleCount; Index++) {

         if (Measurement.Handle == HandleBuffer[Index]) {

@@ -776,8 +776,8 @@
                           &Measurement.EndTimeStamp,

                           &Measurement.Identifier)) != 0)

   {

-    AsciiStrToUnicodeStrS (Measurement.Module, mGaugeString, sizeof (mGaugeString) / sizeof (mGaugeString[0]));

-    AsciiStrToUnicodeStrS (Measurement.Token, mUnicodeToken, sizeof (mUnicodeToken) / sizeof (mUnicodeToken[0]));

+    AsciiStrToUnicodeStrS (Measurement.Module, mGaugeString, ARRAY_SIZE (mGaugeString));

+    AsciiStrToUnicodeStrS (Measurement.Token, mUnicodeToken, ARRAY_SIZE (mUnicodeToken));

     mGaugeString[25] = 0;

     mUnicodeToken[31] = 0;

     if ( ! ( IsPhase( &Measurement)  ||