From b6b6baa7735e09a95fa9504e9a9746cdc4e970e6 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Tue, 9 Jan 2018 06:20:18 +0100
Subject: [PATCH] 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 <linux/pkt_sched.h>
 
 #if WITH_JSON_VALIDATION
-#include "nm-jansson.h"
+#include "nm-json.h"
 #endif
 
 #include "nm-utils/nm-jansson.h"