diff options
| author | Inga Stotland <inga.stotland@intel.com> | 2019-07-14 16:23:12 -0700 |
|---|---|---|
| committer | Brian Gix <brian.gix@intel.com> | 2019-07-15 14:44:38 -0700 |
| commit | 0c698b33a7841961f1097907b346bc73fba1f3e8 (patch) | |
| tree | 11008ac5baf53ae9bb187c973c09f70a427420d0 | |
| parent | 76700ab92b6daccab999faf0460220bb97b7b4c5 (diff) | |
| download | bluez-0c698b33a7841961f1097907b346bc73fba1f3e8.tar.gz | |
mesh: Rename mesh-db.c to mesh-config-json.c
This moves mesh-db.h to mesh-config.h and mesh-db.c to mesh-config-json.c.
mesh-config.h declares common APIs for storing mesh node configuration.
mesh-config-json.c defines the APIs for JSOn specific storage.
This allows for future parallel implementation a different (not JSON-based)
mechanism of storing node configuration.
| -rw-r--r-- | Makefile.mesh | 2 | ||||
| -rw-r--r-- | mesh/cfgmod-server.c | 3 | ||||
| -rw-r--r-- | mesh/mesh-config-json.c (renamed from mesh/mesh-db.c) | 3 | ||||
| -rw-r--r-- | mesh/mesh-config.h (renamed from mesh/mesh-db.h) | 0 | ||||
| -rw-r--r-- | mesh/model.c | 2 | ||||
| -rw-r--r-- | mesh/node.c | 2 | ||||
| -rw-r--r-- | mesh/storage.c | 3 |
7 files changed, 6 insertions, 9 deletions
diff --git a/Makefile.mesh b/Makefile.mesh index 1ace507af..502ba2a47 100644 --- a/Makefile.mesh +++ b/Makefile.mesh @@ -25,7 +25,7 @@ mesh_sources = mesh/mesh.h mesh/mesh.c \ mesh/provision.h mesh/prov.h \ mesh/model.h mesh/model.c \ mesh/cfgmod.h mesh/cfgmod-server.c \ - mesh/mesh-db.h mesh/mesh-db.c \ + mesh/mesh-config.h mesh/mesh-config-json.c \ mesh/util.h mesh/util.c \ mesh/dbus.h mesh/dbus.c \ mesh/agent.h mesh/agent.c \ diff --git a/mesh/cfgmod-server.c b/mesh/cfgmod-server.c index a19ddc72e..486c87307 100644 --- a/mesh/cfgmod-server.c +++ b/mesh/cfgmod-server.c @@ -32,8 +32,7 @@ #include "mesh/appkey.h" #include "mesh/model.h" #include "mesh/storage.h" -#include "mesh/mesh-db.h" - +#include "mesh/mesh-config.h" #include "mesh/cfgmod.h" #define CFG_MAX_MSG_LEN 380 diff --git a/mesh/mesh-db.c b/mesh/mesh-config-json.c index e0a000261..35d0bd27e 100644 --- a/mesh/mesh-db.c +++ b/mesh/mesh-config-json.c @@ -31,8 +31,7 @@ #include "mesh/mesh-defs.h" #include "mesh/util.h" - -#include "mesh/mesh-db.h" +#include "mesh/mesh-config.h" #define CHECK_KEY_IDX_RANGE(x) (((x) >= 0) && ((x) <= 4095)) diff --git a/mesh/mesh-db.h b/mesh/mesh-config.h index da5efa12a..da5efa12a 100644 --- a/mesh/mesh-db.h +++ b/mesh/mesh-config.h diff --git a/mesh/model.c b/mesh/model.c index e08f95b71..0474762e0 100644 --- a/mesh/model.c +++ b/mesh/model.c @@ -30,7 +30,7 @@ #include "mesh/mesh.h" #include "mesh/crypto.h" #include "mesh/node.h" -#include "mesh/mesh-db.h" +#include "mesh/mesh-config.h" #include "mesh/net.h" #include "mesh/appkey.h" #include "mesh/cfgmod.h" diff --git a/mesh/node.c b/mesh/node.c index dc9781482..51cf4cda8 100644 --- a/mesh/node.c +++ b/mesh/node.c @@ -31,7 +31,7 @@ #include "mesh/mesh-defs.h" #include "mesh/mesh.h" #include "mesh/net.h" -#include "mesh/mesh-db.h" +#include "mesh/mesh-config.h" #include "mesh/provision.h" #include "mesh/storage.h" #include "mesh/keyring.h" diff --git a/mesh/storage.c b/mesh/storage.c index 2b7804242..bba2ef348 100644 --- a/mesh/storage.c +++ b/mesh/storage.c @@ -22,7 +22,6 @@ #endif #define _GNU_SOURCE -//#include <errno.h> #include <fcntl.h> #include <stdio.h> #include <unistd.h> @@ -37,7 +36,7 @@ #include "mesh/node.h" #include "mesh/net.h" #include "mesh/appkey.h" -#include "mesh/mesh-db.h" +#include "mesh/mesh-config.h" #include "mesh/util.h" #include "mesh/storage.h" |