commit 24f5aa8fc177080f917b4b4f94ad63796325e45d
author Brian Silverman <bsilver16384@gmail.com> Tue Jun 23 16:21:28 2020 -0700
committer Brian Silverman <bsilver16384@gmail.com> Tue Jun 23 17:04:28 2020 -0700
tree 68f815761a78be9cd1319a5d9000a5cfd7d32b0e
parent 7dcbbcb030729833e69c9d512355ded4f4388e89

Pull out a MergeWithConfig helper

Change-Id: I1dc55a06a8fb3c20b1376ebb6f579495482ea94a

aos/configuration.cc

diff --git a/aos/configuration.cc b/aos/configuration.cc
index 43e44f2..f379166 100644
--- a/aos/configuration.cc
+++ b/aos/configuration.cc
@@ -458,11 +458,16 @@
 }
 
 FlatbufferDetachedBuffer<Configuration> MergeWithConfig(
+    const Configuration *config, const Flatbuffer<Configuration> &addition) {
+  return MergeConfiguration(MergeFlatBuffers(config, &addition.message()));
+}
+
+FlatbufferDetachedBuffer<Configuration> MergeWithConfig(
     const Configuration *config, std::string_view json) {
   FlatbufferDetachedBuffer<Configuration> addition =
       JsonToFlatbuffer(json, Configuration::MiniReflectTypeTable());
 
-  return MergeConfiguration(MergeFlatBuffers(config, &addition.message()));
+  return MergeWithConfig(config, addition);
 }
 
 const Channel *GetChannel(const Configuration *config, std::string_view name,

aos/configuration.h

diff --git a/aos/configuration.h b/aos/configuration.h
index ccc6246..a01a902 100644
--- a/aos/configuration.h
+++ b/aos/configuration.h
@@ -36,6 +36,8 @@
 // returns the modified config.
 FlatbufferDetachedBuffer<Configuration> MergeWithConfig(
     const Configuration *config, std::string_view json);
+FlatbufferDetachedBuffer<Configuration> MergeWithConfig(
+    const Configuration *config, const Flatbuffer<Configuration> &addition);
 
 // Returns the resolved location for a name, type, and application name. Returns
 // nullptr if none is found.