Vlv2TbltDevicePkg: Sync with edk2/master

[edk2-devel] [Patch 05/16] Vlv2TbltDevicePkg/SmBiosMiscDxe: Fix GCC build issue

Posted by Michael D Kinney 6 years, 9 months ago

From: Michael D Kinney <mdkinney@mdkinney-desk.amr.corp.intel.com>

Fix loop comparison for end of languages.

Cc: Zailiang Sun <zailiang.sun@intel.com>
Cc: Yi Qian <yi.qian@intel.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
---
 .../MiscNumberOfInstallableLanguagesFunction.c         | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscNumberOfInstallableLanguagesFunction.c b/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscNumberOfInstallableLanguagesFunction.c
index 9fff8d8850..4a96a2c465 100644
--- a/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscNumberOfInstallableLanguagesFunction.c
+++ b/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscNumberOfInstallableLanguagesFunction.c
@@ -1,10 +1,12 @@
 /*++
 
-Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+Copyright (c) 2009 - 2019, Intel Corporation. All rights reserved.<BR>
+
+
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+
+
 
 
 Module Name:
@@ -68,7 +70,7 @@ CurrentLanguageMatch (
     // Find the best matching RFC 4646 language, compute the offset.
     //
     CompareLength = AsciiStrLen (BestLanguage);
-    for (MatchLang = Languages, (*Offset) = 0; MatchLang != '\0'; (*Offset)++) {
+    for (MatchLang = Languages, (*Offset) = 0; *MatchLang != '\0'; (*Offset)++) {
       //
       // Seek to the end of current match language.
       //
-- 
2.21.0.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#40251): https://edk2.groups.io/g/devel/message/40251
Mute This Topic: https://groups.io/mt/31551774/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [Patch 05/16] Vlv2TbltDevicePkg/SmBiosMiscDxe: Fix GCC build issue

Posted by Sun, Zailiang 6 years, 9 months ago

Reviewed-by: Zailiang Sun <zailiang.sun@intel.com>

> -----Original Message-----
> From: Kinney, Michael D
> Sent: Thursday, May 9, 2019 12:31 PM
> To: devel@edk2.groups.io
> Cc: Michael D Kinney <mdkinney@mdkinney-desk.amr.corp.intel.com>; Sun,
> Zailiang <zailiang.sun@intel.com>; Qian, Yi <yi.qian@intel.com>
> Subject: [Patch 05/16] Vlv2TbltDevicePkg/SmBiosMiscDxe: Fix GCC build
> issue
> 
> From: Michael D Kinney <mdkinney@mdkinney-desk.amr.corp.intel.com>
> 
> Fix loop comparison for end of languages.
> 
> Cc: Zailiang Sun <zailiang.sun@intel.com>
> Cc: Yi Qian <yi.qian@intel.com>
> Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
> ---
>  .../MiscNumberOfInstallableLanguagesFunction.c         | 10 ++++++----
>  1 file changed, 6 insertions(+), 4 deletions(-)
> 
> diff --git
> a/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscNumberOfInstallableLanguagesFu
> nction.c
> b/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscNumberOfInstallableLanguagesFu
> nction.c
> index 9fff8d8850..4a96a2c465 100644
> ---
> a/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscNumberOfInstallableLanguagesFu
> nction.c
> +++
> b/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscNumberOfInstallableLanguagesFu
> nction.c
> @@ -1,10 +1,12 @@
>  /*++
> 
> -Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>
> -
> 
> +Copyright (c) 2009 - 2019, Intel Corporation. All rights reserved.<BR>
> +
> +
>    SPDX-License-Identifier: BSD-2-Clause-Patent
> 
> -
> 
> +
> +
> 
> 
>  Module Name:
> @@ -68,7 +70,7 @@ CurrentLanguageMatch (
>      // Find the best matching RFC 4646 language, compute the offset.
>      //
>      CompareLength = AsciiStrLen (BestLanguage);
> -    for (MatchLang = Languages, (*Offset) = 0; MatchLang != '\0'; (*Offset)++)
> {
> +    for (MatchLang = Languages, (*Offset) = 0; *MatchLang != '\0';
> (*Offset)++) {
>        //
>        // Seek to the end of current match language.
>        //
> --
> 2.21.0.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#40291): https://edk2.groups.io/g/devel/message/40291
Mute This Topic: https://groups.io/mt/31551774/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [Patch 05/16] Vlv2TbltDevicePkg/SmBiosMiscDxe: Fix GCC build issue

Posted by Qian, Yi 6 years, 9 months ago

Reviewed by Qian, Yi <yi.qian@intel.com>

Thanks
QianYi

-----Original Message-----
From: Kinney, Michael D 
Sent: Thursday, May 9, 2019 12:31 PM
To: devel@edk2.groups.io
Cc: Michael D Kinney <mdkinney@mdkinney-desk.amr.corp.intel.com>; Sun, Zailiang <zailiang.sun@intel.com>; Qian, Yi <yi.qian@intel.com>
Subject: [Patch 05/16] Vlv2TbltDevicePkg/SmBiosMiscDxe: Fix GCC build issue

From: Michael D Kinney <mdkinney@mdkinney-desk.amr.corp.intel.com>

Fix loop comparison for end of languages.

Cc: Zailiang Sun <zailiang.sun@intel.com>
Cc: Yi Qian <yi.qian@intel.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
---
 .../MiscNumberOfInstallableLanguagesFunction.c         | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscNumberOfInstallableLanguagesFunction.c b/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscNumberOfInstallableLanguagesFunction.c
index 9fff8d8850..4a96a2c465 100644
--- a/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscNumberOfInstallableLanguagesFunction.c
+++ b/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscNumberOfInstallableLanguagesFunction.c
@@ -1,10 +1,12 @@
 /*++
 
-Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+Copyright (c) 2009 - 2019, Intel Corporation. All rights reserved.<BR>
+
+
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+
+
 
 
 Module Name:
@@ -68,7 +70,7 @@ CurrentLanguageMatch (
     // Find the best matching RFC 4646 language, compute the offset.
     //
     CompareLength = AsciiStrLen (BestLanguage);
-    for (MatchLang = Languages, (*Offset) = 0; MatchLang != '\0'; (*Offset)++) {
+    for (MatchLang = Languages, (*Offset) = 0; *MatchLang != '\0'; (*Offset)++) {
       //
       // Seek to the end of current match language.
       //
-- 
2.21.0.windows.1



-- 
Qian Yi

-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#40345): https://edk2.groups.io/g/devel/message/40345
Mute This Topic: https://groups.io/mt/31551774/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-