From 8040fdbb8b8bbca8a3bb19ecc2b01918ffa8c235 Mon Sep 17 00:00:00 2001
From: Leif Lindholm <quic_llindhol@quicinc.com>
Date: Mon, 30 Sep 2024 12:52:35 +0100
Subject: MdePkg: consistently use "Property" in BaseFdtLib

There is currently a mix on functions named as Prop or Property.
The latter is in majority, and the better fit for tianocore coding style,
so rename FdtNodeOffsetByPropValue () and FdtSetProp () for consistency.

To avoid breaking bisect, change existing users in UefiPayloadPkg.

Continuous-integration-options: PatchCheck.ignore-multi-package
Signed-off-by: Leif Lindholm <quic_llindhol@quicinc.com>
---
 MdePkg/Include/Library/FdtLib.h                               | 4 ++--
 MdePkg/Library/BaseFdtLib/FdtLib.c                            | 4 ++--
 MdePkg/Test/Mock/Include/GoogleTest/Library/MockFdtLib.h      | 4 ++--
 MdePkg/Test/Mock/Library/GoogleTest/MockFdtLib/MockFdtLib.cpp | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'MdePkg')

diff --git a/MdePkg/Include/Library/FdtLib.h b/MdePkg/Include/Library/FdtLib.h
index 17f7159da2..d695b72f48 100644
--- a/MdePkg/Include/Library/FdtLib.h
+++ b/MdePkg/Include/Library/FdtLib.h
@@ -295,7 +295,7 @@ FdtGetReserveMapEntry (
 **/
 INT32
 EFIAPI
-FdtNodeOffsetByPropValue (
+FdtNodeOffsetByPropertyValue (
   IN CONST VOID   *Fdt,
   IN INT32        StartOffset,
   IN CONST CHAR8  *PropertyName,
@@ -424,7 +424,7 @@ FdtAddSubnode (
 **/
 INT32
 EFIAPI
-FdtSetProp (
+FdtSetProperty (
   IN VOID         *Fdt,
   IN INT32        NodeOffset,
   IN CONST CHAR8  *Name,
diff --git a/MdePkg/Library/BaseFdtLib/FdtLib.c b/MdePkg/Library/BaseFdtLib/FdtLib.c
index 7d26959c7c..b1ae2a387c 100644
--- a/MdePkg/Library/BaseFdtLib/FdtLib.c
+++ b/MdePkg/Library/BaseFdtLib/FdtLib.c
@@ -283,7 +283,7 @@ FdtSubnodeOffsetNameLen (
 **/
 INT32
 EFIAPI
-FdtNodeOffsetByPropValue (
+FdtNodeOffsetByPropertyValue (
   IN CONST VOID   *Fdt,
   IN INT32        StartOffset,
   IN CONST CHAR8  *PropertyName,
@@ -433,7 +433,7 @@ FdtAddSubnode (
 **/
 INT32
 EFIAPI
-FdtSetProp (
+FdtSetProperty (
   IN VOID         *Fdt,
   IN INT32        NodeOffset,
   IN CONST CHAR8  *Name,
diff --git a/MdePkg/Test/Mock/Include/GoogleTest/Library/MockFdtLib.h b/MdePkg/Test/Mock/Include/GoogleTest/Library/MockFdtLib.h
index 5b21b232b7..9e9ddc21dd 100644
--- a/MdePkg/Test/Mock/Include/GoogleTest/Library/MockFdtLib.h
+++ b/MdePkg/Test/Mock/Include/GoogleTest/Library/MockFdtLib.h
@@ -89,7 +89,7 @@ struct MockFdtLib {
     );
   MOCK_FUNCTION_DECLARATION (
     INT32,
-    FdtNodeOffsetByPropValue,
+    FdtNodeOffsetByPropertyValue,
     (IN CONST VOID   *Fdt,
      IN INT32        StartOffset,
      IN CONST CHAR8  *PropertyName,
@@ -139,7 +139,7 @@ struct MockFdtLib {
     );
   MOCK_FUNCTION_DECLARATION (
     INT32,
-    FdtSetProp,
+    FdtSetProperty,
     (IN VOID         *Fdt,
      IN INT32        NodeOffset,
      IN CONST CHAR8  *Name,
diff --git a/MdePkg/Test/Mock/Library/GoogleTest/MockFdtLib/MockFdtLib.cpp b/MdePkg/Test/Mock/Library/GoogleTest/MockFdtLib/MockFdtLib.cpp
index a955780d23..8be96704b5 100644
--- a/MdePkg/Test/Mock/Library/GoogleTest/MockFdtLib/MockFdtLib.cpp
+++ b/MdePkg/Test/Mock/Library/GoogleTest/MockFdtLib/MockFdtLib.cpp
@@ -22,13 +22,13 @@ MOCK_FUNCTION_DEFINITION (MockFdtLib, FdtNextNode, 3, EFIAPI);
 MOCK_FUNCTION_DEFINITION (MockFdtLib, FdtFirstSubnode, 2, EFIAPI);
 MOCK_FUNCTION_DEFINITION (MockFdtLib, FdtNextSubnode, 2, EFIAPI);
 MOCK_FUNCTION_DEFINITION (MockFdtLib, FdtSubnodeOffsetNameLen, 4, EFIAPI);
-MOCK_FUNCTION_DEFINITION (MockFdtLib, FdtNodeOffsetByPropValue, 5, EFIAPI);
+MOCK_FUNCTION_DEFINITION (MockFdtLib, FdtNodeOffsetByPropertyValue, 5, EFIAPI);
 MOCK_FUNCTION_DEFINITION (MockFdtLib, FdtGetProperty, 4, EFIAPI);
 MOCK_FUNCTION_DEFINITION (MockFdtLib, FdtFirstPropertyOffset, 2, EFIAPI);
 MOCK_FUNCTION_DEFINITION (MockFdtLib, FdtNextPropertyOffset, 2, EFIAPI);
 MOCK_FUNCTION_DEFINITION (MockFdtLib, FdtGetPropertyByOffset, 3, EFIAPI);
 MOCK_FUNCTION_DEFINITION (MockFdtLib, FdtGetString, 3, EFIAPI);
 MOCK_FUNCTION_DEFINITION (MockFdtLib, FdtAddSubnode, 3, EFIAPI);
-MOCK_FUNCTION_DEFINITION (MockFdtLib, FdtSetProp, 5, EFIAPI);
+MOCK_FUNCTION_DEFINITION (MockFdtLib, FdtSetProperty, 5, EFIAPI);
 MOCK_FUNCTION_DEFINITION (MockFdtLib, FdtGetName, 3, EFIAPI);
 MOCK_FUNCTION_DEFINITION (MockFdtLib, FdtNodeDepth, 2, EFIAPI);
-- 
cgit v1.2.3