commit 6c71c9dcbf9e56a6ae44525b11ca4e4a92b5ab5e
author Sunny Srivastava <sunnsr25@in.ibm.com> Thu Apr 15 04:43:54 2021 -0500
committer Sunny Srivastava <sunnsr25@in.ibm.com> Fri Apr 16 08:15:07 2021 -0500
tree 8c59a8c7af5c95148e90321bc584e6e4eda17988
parent 80f15340a0c462ff6d40191cc20a03ea78f48433

Segregate utility methods

This commit segregates utility methods required commonly by both
openpower-read-vpd and ibm-read-vpd from methods only required by
ibm-read-vpd.
All dependency required by utility methods specific to ibm-read-vpd
is not applicable to utility methods required by openpower-read-vpd.

Hence to avoid un-necessary dependency inclusion, this change is
introduced.

Signed-off-by: Sunny Srivastava <sunnsr25@in.ibm.com>
Change-Id: I95f2be27dc0c391a45beb1654a99506317aaa52b

vpd-manager/editor_impl.cpp

diff --git a/vpd-manager/editor_impl.cpp b/vpd-manager/editor_impl.cpp
index 9ca68fc..23079f2 100644
--- a/vpd-manager/editor_impl.cpp
+++ b/vpd-manager/editor_impl.cpp
@@ -2,9 +2,9 @@
 
 #include "editor_impl.hpp"
 
+#include "ibm_vpd_utils.hpp"
 #include "ipz_parser.hpp"
 #include "parser_factory.hpp"
-#include "utils.hpp"
 
 #include "vpdecc/vpdecc.h"
 

vpd-manager/manager.cpp

diff --git a/vpd-manager/manager.cpp b/vpd-manager/manager.cpp
index 5344664..feb6115 100644
--- a/vpd-manager/manager.cpp
+++ b/vpd-manager/manager.cpp
@@ -3,9 +3,9 @@
 #include "manager.hpp"
 
 #include "editor_impl.hpp"
+#include "ibm_vpd_utils.hpp"
 #include "ipz_parser.hpp"
 #include "reader_impl.hpp"
-#include "utils.hpp"
 
 using namespace openpower::vpd::constants;
 using namespace openpower::vpd::inventory;

vpd-manager/meson.build

diff --git a/vpd-manager/meson.build b/vpd-manager/meson.build
index 56b139e..66e283f 100644
--- a/vpd-manager/meson.build
+++ b/vpd-manager/meson.build
@@ -11,7 +11,8 @@
                       'reader_impl.cpp',
                       '../impl.cpp',
                       '../vpd-parser/ipz_parser.cpp',
-                      '../utils.cpp',
+                      '../ibm_vpd_utils.cpp',
+                      '../common_utility.cpp',
                       '../vpdecc/vpdecc.c',
                       '../vpdecc/vpdecc_support.c',
                       '../vpd-parser//keyword_vpd_parser.cpp',

vpd-manager/reader_impl.cpp

diff --git a/vpd-manager/reader_impl.cpp b/vpd-manager/reader_impl.cpp
index 4da02be..08eb32b 100644
--- a/vpd-manager/reader_impl.cpp
+++ b/vpd-manager/reader_impl.cpp
@@ -2,7 +2,7 @@
 
 #include "reader_impl.hpp"
 
-#include "utils.hpp"
+#include "ibm_vpd_utils.hpp"
 
 #include <algorithm>
 #include <com/ibm/VPD/error.hpp>