Skip to content
Permalink
Browse files

cleanup: include/: move json.h to data/json.h

move json.h to data/json.h and
create a shim for backward-compatibility.

No functional changes to the headers.
A warning in the shim can be controlled with CONFIG_COMPAT_INCLUDES.

Related to #16539

Signed-off-by: Anas Nashif <anas.nashif@intel.com>
  • Loading branch information...
nashif committed Jun 25, 2019
1 parent ef281c4 commit 0abdacf3a4e5fcaf3ad17d9a2439764efc859657
Showing with 649 additions and 634 deletions.
  1. +638 −0 include/data/json.h
  2. +5 −628 include/json.h
  3. +1 −1 lib/os/json.c
  4. +1 −1 lib/updatehub/updatehub.c
  5. +1 −1 samples/net/nats/src/nats.c
  6. +1 −1 subsys/jwt/jwt.c
  7. +1 −1 tests/lib/json/src/main.c
  8. +1 −1 tests/subsys/jwt/src/main.c

Large diffs are not rendered by default.

Large diffs are not rendered by default.

@@ -15,7 +15,7 @@
#include <string.h>
#include <zephyr/types.h>

#include "json.h"
#include <data/json.h>

struct token {
enum json_tokens type;
@@ -20,7 +20,7 @@ LOG_MODULE_REGISTER(updatehub);
#include <flash.h>
#include <misc/reboot.h>
#include <tinycrypt/sha256.h>
#include <json.h>
#include <data/json.h>

#include <updatehub.h>
#include "updatehub_priv.h"
@@ -9,7 +9,7 @@ LOG_MODULE_DECLARE(net_nats_sample, LOG_LEVEL_DBG);

#include <ctype.h>
#include <errno.h>
#include <json.h>
#include <data/json.h>
#include <misc/printk.h>
#include <misc/util.h>
#include <net/net_pkt.h>
@@ -9,7 +9,7 @@
#include <errno.h>

#include <zephyr/jwt.h>
#include <json.h>
#include <data/json.h>

#ifdef CONFIG_JWT_SIGN_RSA
#include <mbedtls/pk.h>
@@ -7,7 +7,7 @@
#include <zephyr/types.h>
#include <stdbool.h>
#include <ztest.h>
#include <json.h>
#include <data/json.h>

struct test_nested {
int nested_int;
@@ -20,7 +20,7 @@
#include <zephyr/types.h>
#include <stdbool.h>
#include <ztest.h>
#include <json.h>
#include <data/json.h>
#include <zephyr/jwt.h>

#include <mbedtls/pk.h>

0 comments on commit 0abdacf

Please sign in to comment.
You can’t perform that action at this time.