From 950a14128bc249626af0770f0003cf83d491bd54 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Tue, 9 Jan 2018 07:10:24 +0100 Subject: [PATCH 1/6] libnm/trivial: don't use non-leading tabs --- libnm-core/nm-jansson.h | 46 ++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/libnm-core/nm-jansson.h b/libnm-core/nm-jansson.h index d3e8285e8e..ed0eef337f 100644 --- a/libnm-core/nm-jansson.h +++ b/libnm-core/nm-jansson.h @@ -19,27 +19,27 @@ gboolean nm_jansson_load (void); #ifndef NM_JAONSSON_C -#define json_object_iter_value (*_nm_jansson_json_object_iter_value) -#define json_object_key_to_iter (*_nm_jansson_json_object_key_to_iter) -#define json_integer (*_nm_jansson_json_integer) -#define json_object_del (*_nm_jansson_json_object_del) -#define json_array_get (*_nm_jansson_json_array_get) -#define json_array_size (*_nm_jansson_json_array_size) -#define json_array_append_new (*_nm_jansson_json_array_append_new) -#define json_string (*_nm_jansson_json_string) -#define json_object_iter_next (*_nm_jansson_json_object_iter_next) -#define json_loads (*_nm_jansson_json_loads) -#define json_dumps (*_nm_jansson_json_dumps) -#define json_object_iter_key (*_nm_jansson_json_object_iter_key) -#define json_object (*_nm_jansson_json_object) -#define json_object_get (*_nm_jansson_json_object_get) -#define json_array (*_nm_jansson_json_array) -#define json_false (*_nm_jansson_json_false) -#define json_delete (*_nm_jansson_json_delete) -#define json_true (*_nm_jansson_json_true) -#define json_object_size (*_nm_jansson_json_object_size) -#define json_object_set_new (*_nm_jansson_json_object_set_new) -#define json_object_iter (*_nm_jansson_json_object_iter) -#define json_integer_value (*_nm_jansson_json_integer_value) -#define json_string_value (*_nm_jansson_json_string_value) +#define json_object_iter_value (*_nm_jansson_json_object_iter_value) +#define json_object_key_to_iter (*_nm_jansson_json_object_key_to_iter) +#define json_integer (*_nm_jansson_json_integer) +#define json_object_del (*_nm_jansson_json_object_del) +#define json_array_get (*_nm_jansson_json_array_get) +#define json_array_size (*_nm_jansson_json_array_size) +#define json_array_append_new (*_nm_jansson_json_array_append_new) +#define json_string (*_nm_jansson_json_string) +#define json_object_iter_next (*_nm_jansson_json_object_iter_next) +#define json_loads (*_nm_jansson_json_loads) +#define json_dumps (*_nm_jansson_json_dumps) +#define json_object_iter_key (*_nm_jansson_json_object_iter_key) +#define json_object (*_nm_jansson_json_object) +#define json_object_get (*_nm_jansson_json_object_get) +#define json_array (*_nm_jansson_json_array) +#define json_false (*_nm_jansson_json_false) +#define json_delete (*_nm_jansson_json_delete) +#define json_true (*_nm_jansson_json_true) +#define json_object_size (*_nm_jansson_json_object_size) +#define json_object_set_new (*_nm_jansson_json_object_set_new) +#define json_object_iter (*_nm_jansson_json_object_iter) +#define json_integer_value (*_nm_jansson_json_integer_value) +#define json_string_value (*_nm_jansson_json_string_value) #endif From b6b6baa7735e09a95fa9504e9a9746cdc4e970e6 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Tue, 9 Jan 2018 06:20:18 +0100 Subject: [PATCH 2/6] libnm: rename "libnm-core/nm-jansson.h" to "libnm-core/nm-json.h" We already have "shared/nm-utils/nm-jansson.h". Avoid reusing the same file name. --- Makefile.am | 4 ++-- libnm-core/meson.build | 2 +- libnm-core/{nm-jansson.c => nm-json.c} | 2 +- libnm-core/{nm-jansson.h => nm-json.h} | 0 libnm-core/nm-utils.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) rename libnm-core/{nm-jansson.c => nm-json.c} (99%) rename libnm-core/{nm-jansson.h => nm-json.h} (100%) diff --git a/Makefile.am b/Makefile.am index dd61b537f6..1b79031248 100644 --- a/Makefile.am +++ b/Makefile.am @@ -522,9 +522,9 @@ libnm_core_lib_c_real = \ if WITH_JSON_VALIDATION libnm_core_lib_h_priv += \ - libnm-core/nm-jansson.h + libnm-core/nm-json.h libnm_core_lib_c_real += \ - libnm-core/nm-jansson.c + libnm-core/nm-json.c endif libnm_core_lib_c_mkenums = \ diff --git a/libnm-core/meson.build b/libnm-core/meson.build index 89988a296d..a011e38608 100644 --- a/libnm-core/meson.build +++ b/libnm-core/meson.build @@ -146,7 +146,7 @@ cflags = [ ] if enable_json_validation - libnm_core_sources += files('nm-jansson.c') + libnm_core_sources += files('nm-json.c') deps += jansson_dep endif diff --git a/libnm-core/nm-jansson.c b/libnm-core/nm-json.c similarity index 99% rename from libnm-core/nm-jansson.c rename to libnm-core/nm-json.c index 154afa2749..2fab91ac45 100644 --- a/libnm-core/nm-jansson.c +++ b/libnm-core/nm-json.c @@ -22,7 +22,7 @@ #include "nm-default.h" #define NM_JAONSSON_C -#include "nm-jansson.h" +#include "nm-json.h" void *_nm_jansson_json_object_iter_value; void *_nm_jansson_json_object_key_to_iter; diff --git a/libnm-core/nm-jansson.h b/libnm-core/nm-json.h similarity index 100% rename from libnm-core/nm-jansson.h rename to libnm-core/nm-json.h diff --git a/libnm-core/nm-utils.c b/libnm-core/nm-utils.c index 61f0733d3f..f58d7942bc 100644 --- a/libnm-core/nm-utils.c +++ b/libnm-core/nm-utils.c @@ -36,7 +36,7 @@ #include #if WITH_JSON_VALIDATION -#include "nm-jansson.h" +#include "nm-json.h" #endif #include "nm-utils/nm-jansson.h" From 288877848067c08abfd82d3ee72765f89ec79968 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Tue, 9 Jan 2018 07:15:40 +0100 Subject: [PATCH 3/6] libnm: fix spelling for NM_JAONSSON_C define --- libnm-core/nm-json.c | 2 +- libnm-core/nm-json.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libnm-core/nm-json.c b/libnm-core/nm-json.c index 2fab91ac45..695ca98eac 100644 --- a/libnm-core/nm-json.c +++ b/libnm-core/nm-json.c @@ -21,7 +21,7 @@ #include "nm-default.h" -#define NM_JAONSSON_C +#define NM_JANSSON_C #include "nm-json.h" void *_nm_jansson_json_object_iter_value; diff --git a/libnm-core/nm-json.h b/libnm-core/nm-json.h index ed0eef337f..3db37aac3b 100644 --- a/libnm-core/nm-json.h +++ b/libnm-core/nm-json.h @@ -18,7 +18,7 @@ gboolean nm_jansson_load (void); -#ifndef NM_JAONSSON_C +#ifndef NM_JANSSON_C #define json_object_iter_value (*_nm_jansson_json_object_iter_value) #define json_object_key_to_iter (*_nm_jansson_json_object_key_to_iter) #define json_integer (*_nm_jansson_json_integer) From ee56c9250fc88eb1983bc587dc5052a70cb88e0f Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Tue, 9 Jan 2018 07:17:06 +0100 Subject: [PATCH 4/6] libnm: add include guard to nm-json.h --- libnm-core/nm-json.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libnm-core/nm-json.h b/libnm-core/nm-json.h index 3db37aac3b..2465ba385d 100644 --- a/libnm-core/nm-json.h +++ b/libnm-core/nm-json.h @@ -15,6 +15,8 @@ * * Copyright 2017, 2018 Red Hat, Inc. */ +#ifndef __NM_JSON_H__ +#define __NM_JSON_H__ gboolean nm_jansson_load (void); @@ -43,3 +45,5 @@ gboolean nm_jansson_load (void); #define json_integer_value (*_nm_jansson_json_integer_value) #define json_string_value (*_nm_jansson_json_string_value) #endif + +#endif /* __NM_JSON_H__ */ From e5f3c0fc8a4f6b88fc74b35479a3ac18eeb6fa93 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Tue, 9 Jan 2018 07:20:19 +0100 Subject: [PATCH 5/6] libnm: only include "nm-jansson.h" from "nm-json.h" "nm-utils/nm-jansson.h" and thus must be included only after "nm-json.h". Enforce that by never including them directly, except from "nm-json.h" itself. --- libnm-core/nm-json.h | 2 ++ libnm-core/nm-utils.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/libnm-core/nm-json.h b/libnm-core/nm-json.h index 2465ba385d..560b827ae0 100644 --- a/libnm-core/nm-json.h +++ b/libnm-core/nm-json.h @@ -44,6 +44,8 @@ gboolean nm_jansson_load (void); #define json_object_iter (*_nm_jansson_json_object_iter) #define json_integer_value (*_nm_jansson_json_integer_value) #define json_string_value (*_nm_jansson_json_string_value) + +#include "nm-utils/nm-jansson.h" #endif #endif /* __NM_JSON_H__ */ diff --git a/libnm-core/nm-utils.c b/libnm-core/nm-utils.c index f58d7942bc..efb8a9befb 100644 --- a/libnm-core/nm-utils.c +++ b/libnm-core/nm-utils.c @@ -39,7 +39,6 @@ #include "nm-json.h" #endif -#include "nm-utils/nm-jansson.h" #include "nm-utils/nm-enum-utils.h" #include "nm-common-macros.h" #include "nm-utils-private.h" From 84576ce86155e195985a1924c90782eb9e2e5beb Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Tue, 9 Jan 2018 07:30:31 +0100 Subject: [PATCH 6/6] libnm: cleanup include in "libnm-core/nm-json.c" We already define _GNU_SOURCE in "config.h", depending on configure checks. Also, we always should first include "config.h" (which means to first include "nm-default.h"). Also, we don't need the entire , suffices. --- libnm-core/nm-json.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libnm-core/nm-json.c b/libnm-core/nm-json.c index 695ca98eac..f359a76046 100644 --- a/libnm-core/nm-json.c +++ b/libnm-core/nm-json.c @@ -16,14 +16,13 @@ * Copyright 2017, 2018 Red Hat, Inc. */ -#define _GNU_SOURCE -#include - #include "nm-default.h" #define NM_JANSSON_C #include "nm-json.h" +#include + void *_nm_jansson_json_object_iter_value; void *_nm_jansson_json_object_key_to_iter; void *_nm_jansson_json_integer;