mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2026-05-05 09:58:07 +02:00
d984b2ce4a
From the files under "shared/nm-utils" we build an internal library
that provides glib-based helper utilities.
Move the files of that basic library to a new subdirectory
"shared/nm-glib-aux" and rename the helper library "libnm-core-base.la"
to "libnm-glib-aux.la".
Reasons:
- the name "utils" is overused in our code-base. Everything's an
"utils". Give this thing a more distinct name.
- there were additional files under "shared/nm-utils", which are not
part of this internal library "libnm-utils-base.la". All the files
that are part of this library should be together in the same
directory, but files that are not, should not be there.
- the new name should better convey what this library is and what is isn't:
it's a set of utilities and helper functions that extend glib with
funcitonality that we commonly need.
There are still some files left under "shared/nm-utils". They have less
a unifying propose to be in their own directory, so I leave them there
for now. But at least they are separate from "shared/nm-glib-aux",
which has a very clear purpose.
(cherry picked from commit 80db06f768)
49 lines
1.7 KiB
C
49 lines
1.7 KiB
C
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
|
|
/*
|
|
* 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 2018 Red Hat, Inc.
|
|
*/
|
|
|
|
#ifndef __NM_JANSSON_H__
|
|
#define __NM_JANSSON_H__
|
|
|
|
/* you need to include at least "config.h" first, possibly "nm-default.h". */
|
|
|
|
#if WITH_JANSSON
|
|
|
|
#include <jansson.h>
|
|
|
|
/* Added in Jansson v2.7 */
|
|
#ifndef json_boolean_value
|
|
#define json_boolean_value json_is_true
|
|
#endif
|
|
|
|
/* Added in Jansson v2.8 */
|
|
#ifndef json_object_foreach_safe
|
|
#define json_object_foreach_safe(object, n, key, value) \
|
|
for (key = json_object_iter_key(json_object_iter(object)), \
|
|
n = json_object_iter_next(object, json_object_key_to_iter(key)); \
|
|
key && (value = json_object_iter_value(json_object_key_to_iter(key))); \
|
|
key = json_object_iter_key(n), \
|
|
n = json_object_iter_next(object, json_object_key_to_iter(key)))
|
|
#endif
|
|
|
|
NM_AUTO_DEFINE_FCN0 (json_t *, _nm_auto_decref_json, json_decref)
|
|
#define nm_auto_decref_json nm_auto(_nm_auto_decref_json)
|
|
|
|
#endif /* WITH_JANSON */
|
|
|
|
#endif /* __NM_JANSSON_H__ */
|