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.h b/libnm-core/nm-jansson.h deleted file mode 100644 index d3e8285e8e..0000000000 --- a/libnm-core/nm-jansson.h +++ /dev/null @@ -1,45 +0,0 @@ -/* - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Copyright 2017, 2018 Red Hat, Inc. - */ - -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) -#endif diff --git a/libnm-core/nm-jansson.c b/libnm-core/nm-json.c similarity index 97% rename from libnm-core/nm-jansson.c rename to libnm-core/nm-json.c index 154afa2749..f359a76046 100644 --- a/libnm-core/nm-jansson.c +++ b/libnm-core/nm-json.c @@ -16,13 +16,12 @@ * Copyright 2017, 2018 Red Hat, Inc. */ -#define _GNU_SOURCE -#include - #include "nm-default.h" -#define NM_JAONSSON_C -#include "nm-jansson.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; diff --git a/libnm-core/nm-json.h b/libnm-core/nm-json.h new file mode 100644 index 0000000000..560b827ae0 --- /dev/null +++ b/libnm-core/nm-json.h @@ -0,0 +1,51 @@ +/* + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Copyright 2017, 2018 Red Hat, Inc. + */ +#ifndef __NM_JSON_H__ +#define __NM_JSON_H__ + +gboolean nm_jansson_load (void); + +#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) +#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) + +#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 61f0733d3f..efb8a9befb 100644 --- a/libnm-core/nm-utils.c +++ b/libnm-core/nm-utils.c @@ -36,10 +36,9 @@ #include #if WITH_JSON_VALIDATION -#include "nm-jansson.h" +#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"