New upstream version 1.27.90 upstream/1.27.90

1 files changed, 67 insertions, 45 deletions

diff --git a/libnm-core/nm-keyfile/nm-keyfile-utils.h b/libnm-core/nm-keyfile/nm-keyfile-utils.h
index 4764311b..efad8317 100644
--- a/libnm-core/nm-keyfile/nm-keyfile-utils.h
+++ b/libnm-core/nm-keyfile/nm-keyfile-utils.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright (C) 2010 - 2015 Red Hat, Inc.
  */
@@ -6,8 +6,8 @@
 #ifndef __NM_KEYFILE_UTILS_H__
 #define __NM_KEYFILE_UTILS_H__
 
-#if !((NETWORKMANAGER_COMPILATION) & NM_NETWORKMANAGER_COMPILATION_WITH_LIBNM_CORE_INTERNAL)
-#error Cannot use this header.
+#if !((NETWORKMANAGER_COMPILATION) &NM_NETWORKMANAGER_COMPILATION_WITH_LIBNM_CORE_INTERNAL)
+    #error Cannot use this header.
 #endif
 
 /*****************************************************************************/
@@ -19,55 +19,77 @@
 #define NM_KEYFILE_GROUP_VPN_SECRETS          "vpn-secrets"
 #define NM_KEYFILE_GROUPPREFIX_WIREGUARD_PEER "wireguard-peer."
 
-#define nm_keyfile_error_is_not_found(error) \
-	nm_g_error_matches (error, \
-	                    G_KEY_FILE_ERROR, \
-	                    G_KEY_FILE_ERROR_GROUP_NOT_FOUND, \
-	                    G_KEY_FILE_ERROR_KEY_NOT_FOUND)
+#define nm_keyfile_error_is_not_found(error)             \
+    nm_g_error_matches(error,                            \
+                       G_KEY_FILE_ERROR,                 \
+                       G_KEY_FILE_ERROR_GROUP_NOT_FOUND, \
+                       G_KEY_FILE_ERROR_KEY_NOT_FOUND)
 
-const char *nm_keyfile_plugin_get_alias_for_setting_name (const char *setting_name);
+const char *nm_keyfile_plugin_get_alias_for_setting_name(const char *setting_name);
 
-const char *nm_keyfile_plugin_get_setting_name_for_alias (const char *alias);
+const char *nm_keyfile_plugin_get_setting_name_for_alias(const char *alias);
 
 /*****************************************************************************/
 
-guint   *nm_keyfile_plugin_kf_get_integer_list_uint (GKeyFile *kf, const char *group, const char *key, gsize *out_length, GError **error);
-char   **nm_keyfile_plugin_kf_get_string_list       (GKeyFile *kf, const char *group, const char *key, gsize *out_length, GError **error);
-char    *nm_keyfile_plugin_kf_get_string            (GKeyFile *kf, const char *group, const char *key, GError **error);
-gboolean nm_keyfile_plugin_kf_get_boolean           (GKeyFile *kf, const char *group, const char *key, GError **error);
-char    *nm_keyfile_plugin_kf_get_value             (GKeyFile *kf, const char *group, const char *key, GError **error);
-
-void nm_keyfile_plugin_kf_set_integer_list_uint8 (GKeyFile *kf, const char *group, const char *key, const guint8     *list, gsize length);
-void nm_keyfile_plugin_kf_set_integer_list_uint  (GKeyFile *kf, const char *group, const char *key, const guint      *list, gsize length);
-void nm_keyfile_plugin_kf_set_string_list        (GKeyFile *kf, const char *group, const char *key, const char *const*list, gsize length);
-
-void nm_keyfile_plugin_kf_set_string       (GKeyFile *kf, const char *group, const char *key, const char *value);
-void nm_keyfile_plugin_kf_set_boolean      (GKeyFile *kf, const char *group, const char *key, gboolean    value);
-void nm_keyfile_plugin_kf_set_value        (GKeyFile *kf, const char *group, const char *key, const char *value);
-
-gint64 nm_keyfile_plugin_kf_get_int64 (GKeyFile *kf,
-                                       const char *group,
-                                       const char *key,
-                                       guint base,
-                                       gint64 min,
-                                       gint64 max,
-                                       gint64 fallback,
-                                       GError **error);
-
-char **nm_keyfile_plugin_kf_get_keys (GKeyFile *kf,
+guint *nm_keyfile_plugin_kf_get_integer_list_uint(GKeyFile *  kf,
+                                                  const char *group,
+                                                  const char *key,
+                                                  gsize *     out_length,
+                                                  GError **   error);
+char **nm_keyfile_plugin_kf_get_string_list(GKeyFile *  kf,
+                                            const char *group,
+                                            const char *key,
+                                            gsize *     out_length,
+                                            GError **   error);
+char *
+nm_keyfile_plugin_kf_get_string(GKeyFile *kf, const char *group, const char *key, GError **error);
+gboolean
+nm_keyfile_plugin_kf_get_boolean(GKeyFile *kf, const char *group, const char *key, GError **error);
+char *
+nm_keyfile_plugin_kf_get_value(GKeyFile *kf, const char *group, const char *key, GError **error);
+
+void nm_keyfile_plugin_kf_set_integer_list_uint8(GKeyFile *    kf,
+                                                 const char *  group,
+                                                 const char *  key,
+                                                 const guint8 *list,
+                                                 gsize         length);
+void nm_keyfile_plugin_kf_set_integer_list_uint(GKeyFile *   kf,
+                                                const char * group,
+                                                const char * key,
+                                                const guint *list,
+                                                gsize        length);
+void nm_keyfile_plugin_kf_set_string_list(GKeyFile *         kf,
+                                          const char *       group,
+                                          const char *       key,
+                                          const char *const *list,
+                                          gsize              length);
+
+void nm_keyfile_plugin_kf_set_string(GKeyFile *  kf,
+                                     const char *group,
+                                     const char *key,
+                                     const char *value);
+void
+nm_keyfile_plugin_kf_set_boolean(GKeyFile *kf, const char *group, const char *key, gboolean value);
+void
+nm_keyfile_plugin_kf_set_value(GKeyFile *kf, const char *group, const char *key, const char *value);
+
+gint64 nm_keyfile_plugin_kf_get_int64(GKeyFile *  kf,
                                       const char *group,
-                                      gsize *out_length,
-                                      GError **error);
+                                      const char *key,
+                                      guint       base,
+                                      gint64      min,
+                                      gint64      max,
+                                      gint64      fallback,
+                                      GError **   error);
 
-gboolean nm_keyfile_plugin_kf_has_key (GKeyFile *kf,
-                                       const char *group,
-                                       const char *key,
-                                       GError **error);
+char **
+nm_keyfile_plugin_kf_get_keys(GKeyFile *kf, const char *group, gsize *out_length, GError **error);
 
-const char *nm_keyfile_key_encode (const char *name,
-                                   char **out_to_free);
+gboolean
+nm_keyfile_plugin_kf_has_key(GKeyFile *kf, const char *group, const char *key, GError **error);
 
-const char *nm_keyfile_key_decode (const char *key,
-                                   char **out_to_free);
+const char *nm_keyfile_key_encode(const char *name, char **out_to_free);
 
-#endif  /* __NM_KEYFILE_UTILS_H__ */
+const char *nm_keyfile_key_decode(const char *key, char **out_to_free);
+
+#endif /* __NM_KEYFILE_UTILS_H__ */