1. Patchew
  2. EDK2
  3. View series

[edk2] [PATCH] MdeModulePkg/ResetUtilityLib: Fix GCC build failure

Ruiyu Ni posted 1 patch 6 years, 10 months ago
Failed in applying to current master (apply log)
MdeModulePkg/Library/ResetUtilityLib/ResetUtility.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
[edk2] [PATCH] MdeModulePkg/ResetUtilityLib: Fix GCC build failure
Posted by Ruiyu Ni 6 years, 10 months ago 
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
Cc: Dandan Bi <dandan.bi@intel.com>
---
 MdeModulePkg/Library/ResetUtilityLib/ResetUtility.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/MdeModulePkg/Library/ResetUtilityLib/ResetUtility.c b/MdeModulePkg/Library/ResetUtilityLib/ResetUtility.c
index 90de94ca9b..da5fa7b094 100644
--- a/MdeModulePkg/Library/ResetUtilityLib/ResetUtility.c
+++ b/MdeModulePkg/Library/ResetUtilityLib/ResetUtility.c
@@ -1,7 +1,7 @@
 /** @file
   This contains the business logic for the module-specific Reset Helper functions.
 
-  Copyright (c) 2017 Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2017 - 2018 Intel Corporation. All rights reserved.<BR>
   Copyright (c) 2016 Microsoft Corporation. All rights reserved.<BR>
 
   This program and the accompanying materials are licensed and made available under
@@ -100,7 +100,7 @@ GetResetPlatformSpecificGuid (
   //
   if ((ResetDataStringSize < DataSize) && (DataSize - ResetDataStringSize) >= sizeof (GUID)) {
     ResetSubtypeGuid = (GUID *)((UINT8 *)ResetData + ResetDataStringSize);
-    DEBUG ((DEBUG_VERBOSE, __FUNCTION__" - Detected reset subtype %g...\n", ResetSubtypeGuid));
+    DEBUG ((DEBUG_VERBOSE, "%a - Detected reset subtype %g...\n", __FUNCTION__, ResetSubtypeGuid));
     return ResetSubtypeGuid;
   }
   return NULL;
-- 
2.16.1.windows.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [PATCH] MdeModulePkg/ResetUtilityLib: Fix GCC build failure
Posted by Zeng, Star 6 years, 10 months ago 
Reviewed-by: Star Zeng <star.zeng@intel.com>

Thanks,
Star
-----Original Message-----
From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of Ruiyu Ni
Sent: Tuesday, February 13, 2018 11:03 AM
To: edk2-devel@lists.01.org
Cc: Bi, Dandan <dandan.bi@intel.com>
Subject: [edk2] [PATCH] MdeModulePkg/ResetUtilityLib: Fix GCC build failure

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
Cc: Dandan Bi <dandan.bi@intel.com>
---
 MdeModulePkg/Library/ResetUtilityLib/ResetUtility.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/MdeModulePkg/Library/ResetUtilityLib/ResetUtility.c b/MdeModulePkg/Library/ResetUtilityLib/ResetUtility.c
index 90de94ca9b..da5fa7b094 100644
--- a/MdeModulePkg/Library/ResetUtilityLib/ResetUtility.c
+++ b/MdeModulePkg/Library/ResetUtilityLib/ResetUtility.c
@@ -1,7 +1,7 @@
 /** @file
   This contains the business logic for the module-specific Reset Helper functions.
 
-  Copyright (c) 2017 Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2017 - 2018 Intel Corporation. All rights reserved.<BR>
   Copyright (c) 2016 Microsoft Corporation. All rights reserved.<BR>
 
   This program and the accompanying materials are licensed and made available under @@ -100,7 +100,7 @@ GetResetPlatformSpecificGuid (
   //
   if ((ResetDataStringSize < DataSize) && (DataSize - ResetDataStringSize) >= sizeof (GUID)) {
     ResetSubtypeGuid = (GUID *)((UINT8 *)ResetData + ResetDataStringSize);
-    DEBUG ((DEBUG_VERBOSE, __FUNCTION__" - Detected reset subtype %g...\n", ResetSubtypeGuid));
+    DEBUG ((DEBUG_VERBOSE, "%a - Detected reset subtype %g...\n", 
+ __FUNCTION__, ResetSubtypeGuid));
     return ResetSubtypeGuid;
   }
   return NULL;
--
2.16.1.windows.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [PATCH] MdeModulePkg/ResetUtilityLib: Fix GCC build failure
Posted by Kinney, Michael D 6 years, 10 months ago 
Reviewed-by: Michael D Kinney <michael.d.kinney@intel.com>

> -----Original Message-----
> From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org]
> On Behalf Of Zeng, Star
> Sent: Monday, February 12, 2018 11:28 PM
> To: Ni, Ruiyu <ruiyu.ni@intel.com>; edk2-
> devel@lists.01.org
> Cc: Bi, Dandan <dandan.bi@intel.com>; Zeng, Star
> <star.zeng@intel.com>
> Subject: Re: [edk2] [PATCH] MdeModulePkg/ResetUtilityLib:
> Fix GCC build failure
> 
> Reviewed-by: Star Zeng <star.zeng@intel.com>
> 
> Thanks,
> Star
> -----Original Message-----
> From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org]
> On Behalf Of Ruiyu Ni
> Sent: Tuesday, February 13, 2018 11:03 AM
> To: edk2-devel@lists.01.org
> Cc: Bi, Dandan <dandan.bi@intel.com>
> Subject: [edk2] [PATCH] MdeModulePkg/ResetUtilityLib: Fix
> GCC build failure
> 
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
> Cc: Dandan Bi <dandan.bi@intel.com>
> ---
>  MdeModulePkg/Library/ResetUtilityLib/ResetUtility.c | 4
> ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git
> a/MdeModulePkg/Library/ResetUtilityLib/ResetUtility.c
> b/MdeModulePkg/Library/ResetUtilityLib/ResetUtility.c
> index 90de94ca9b..da5fa7b094 100644
> --- a/MdeModulePkg/Library/ResetUtilityLib/ResetUtility.c
> +++ b/MdeModulePkg/Library/ResetUtilityLib/ResetUtility.c
> @@ -1,7 +1,7 @@
>  /** @file
>    This contains the business logic for the module-
> specific Reset Helper functions.
> 
> -  Copyright (c) 2017 Intel Corporation. All rights
> reserved.<BR>
> +  Copyright (c) 2017 - 2018 Intel Corporation. All
> rights reserved.<BR>
>    Copyright (c) 2016 Microsoft Corporation. All rights
> reserved.<BR>
> 
>    This program and the accompanying materials are
> licensed and made available under @@ -100,7 +100,7 @@
> GetResetPlatformSpecificGuid (
>    //
>    if ((ResetDataStringSize < DataSize) && (DataSize -
> ResetDataStringSize) >= sizeof (GUID)) {
>      ResetSubtypeGuid = (GUID *)((UINT8 *)ResetData +
> ResetDataStringSize);
> -    DEBUG ((DEBUG_VERBOSE, __FUNCTION__" - Detected
> reset subtype %g...\n", ResetSubtypeGuid));
> +    DEBUG ((DEBUG_VERBOSE, "%a - Detected reset subtype
> %g...\n",
> + __FUNCTION__, ResetSubtypeGuid));
>      return ResetSubtypeGuid;
>    }
>    return NULL;
> --
> 2.16.1.windows.1
> 
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Patchew 2.1-devel-8c64711

© 2016 - 2024 Red Hat, Inc.