summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2020-07-01 23:39:53 +0200
committerThomas Haller <thaller@redhat.com>2020-07-08 12:12:43 +0200
commitf7c519b1a3c47cf55494acf94db751189af91093 (patch)
tree385d739ea45dca765f3b749b31a90729322fab7e
parentcd1400782e41647b9681187b3bb885fa035ec1c9 (diff)
downloadNetworkManager-f7c519b1a3c47cf55494acf94db751189af91093.tar.gz
shared: drop unused code from "shared/nm-glib-aux/nm-jansson.h"
-rw-r--r--shared/nm-glib-aux/nm-jansson.h100
1 files changed, 0 insertions, 100 deletions
diff --git a/shared/nm-glib-aux/nm-jansson.h b/shared/nm-glib-aux/nm-jansson.h
index 946f42d183..9314b50c69 100644
--- a/shared/nm-glib-aux/nm-jansson.h
+++ b/shared/nm-glib-aux/nm-jansson.h
@@ -25,106 +25,6 @@
NM_AUTO_DEFINE_FCN0 (json_t *, _nm_auto_decref_json, json_decref)
#define nm_auto_decref_json nm_auto(_nm_auto_decref_json)
-/*****************************************************************************/
-
-static inline int
-nm_jansson_json_as_bool (const json_t *elem,
- bool *out_val)
-{
- if (!elem)
- return 0;
-
- if (!json_is_boolean (elem))
- return -EINVAL;
-
- NM_SET_OUT (out_val, json_boolean_value (elem));
- return 1;
-}
-
-static inline int
-nm_jansson_json_as_int32 (const json_t *elem,
- gint32 *out_val)
-{
- json_int_t v;
-
- if (!elem)
- return 0;
-
- if (!json_is_integer (elem))
- return -EINVAL;
-
- v = json_integer_value (elem);
- if ( v < (gint64) G_MININT32
- || v > (gint64) G_MAXINT32)
- return -ERANGE;
-
- NM_SET_OUT (out_val, v);
- return 1;
-}
-
-static inline int
-nm_jansson_json_as_int (const json_t *elem,
- int *out_val)
-{
- json_int_t v;
-
- if (!elem)
- return 0;
-
- if (!json_is_integer (elem))
- return -EINVAL;
-
- v = json_integer_value (elem);
- if ( v < (gint64) G_MININT
- || v > (gint64) G_MAXINT)
- return -ERANGE;
-
- NM_SET_OUT (out_val, v);
- return 1;
-}
-
-static inline int
-nm_jansson_json_as_string (const json_t *elem,
- const char **out_val)
-{
- if (!elem)
- return 0;
-
- if (!json_is_string (elem))
- return -EINVAL;
-
- NM_SET_OUT (out_val, json_string_value (elem));
- return 1;
-}
-
-/*****************************************************************************/
-
-#ifdef NM_VALUE_TYPE_DEFINE_FUNCTIONS
-#include "nm-value-type.h"
-static inline gboolean
-nm_value_type_from_json (NMValueType value_type,
- const json_t *elem,
- gpointer out_val)
-{
- switch (value_type) {
- case NM_VALUE_TYPE_BOOL: return (nm_jansson_json_as_bool (elem, out_val) > 0);
- case NM_VALUE_TYPE_INT32: return (nm_jansson_json_as_int32 (elem, out_val) > 0);
- case NM_VALUE_TYPE_INT: return (nm_jansson_json_as_int (elem, out_val) > 0);
-
- /* warning: this overwrites/leaks the previous value. You better have *out_val
- * point to uninitialized memory or NULL. */
- case NM_VALUE_TYPE_STRING: return (nm_jansson_json_as_string (elem, out_val) > 0);
-
- case NM_VALUE_TYPE_UNSPEC:
- break;
- }
- nm_assert_not_reached ();
- return FALSE;
-}
-#endif
-
-/*****************************************************************************/
-
#endif /* WITH_JANSON */
#endif /* __NM_JANSSON_H__ */