New upstream version 1.35.91 upstream/1.35.91

4 files changed, 50 insertions, 50 deletions

diff --git a/src/contrib/nm-compat.c b/src/contrib/nm-compat.c
index f15c29c9..d322cb1f 100644
--- a/src/contrib/nm-compat.c
+++ b/src/contrib/nm-compat.c
@@ -22,7 +22,7 @@ _get_keys(NMSettingVpn *setting, gboolean is_secrets, guint *out_length)
 {
     guint        len;
     const char **keys = NULL;
-    GPtrArray *  a;
+    GPtrArray   *a;
 
     nm_assert(NM_IS_SETTING_VPN(setting));
 
diff --git a/src/contrib/nm-vpn-editor-plugin-call.h b/src/contrib/nm-vpn-editor-plugin-call.h
index be0a6772..713ddf08 100644
--- a/src/contrib/nm-vpn-editor-plugin-call.h
+++ b/src/contrib/nm-vpn-editor-plugin-call.h
@@ -33,21 +33,21 @@ typedef enum { /*< skip >*/
 } NMVpnEditorPluginServiceFlags;
 
 struct _NMVpnEditorPluginVT {
-    gboolean (*fcn_get_service_info)(NMVpnEditorPlugin *            plugin,
-                                     const char *                   service_type,
-                                     char **                        out_short_name,
-                                     char **                        out_pretty_name,
-                                     char **                        out_description,
+    gboolean (*fcn_get_service_info)(NMVpnEditorPlugin             *plugin,
+                                     const char                    *service_type,
+                                     char                         **out_short_name,
+                                     char                         **out_pretty_name,
+                                     char                         **out_description,
                                      NMVpnEditorPluginServiceFlags *out_flags);
     char **(*fcn_get_service_add_details)(NMVpnEditorPlugin *plugin, const char *service_name);
     gboolean (*fcn_get_service_add_detail)(NMVpnEditorPlugin *plugin,
-                                           const char *       service_type,
-                                           const char *       add_detail,
-                                           char **            out_pretty_name,
-                                           char **            out_description,
-                                           char **            out_add_detail_key,
-                                           char **            out_add_detail_val,
-                                           guint *            out_flags);
+                                           const char        *service_type,
+                                           const char        *add_detail,
+                                           char             **out_pretty_name,
+                                           char             **out_description,
+                                           char             **out_add_detail_key,
+                                           char             **out_add_detail_val,
+                                           guint             *out_flags);
 };
 
 /*****************************************************************************
@@ -58,17 +58,17 @@ struct _NMVpnEditorPluginVT {
  *****************************************************************************/
 
 static inline gboolean
-nm_vpn_editor_plugin_get_service_info(NMVpnEditorPlugin *            plugin,
-                                      const char *                   service_type,
-                                      char **                        out_short_name,
-                                      char **                        out_pretty_name,
-                                      char **                        out_description,
+nm_vpn_editor_plugin_get_service_info(NMVpnEditorPlugin             *plugin,
+                                      const char                    *service_type,
+                                      char                         **out_short_name,
+                                      char                         **out_pretty_name,
+                                      char                         **out_description,
                                       NMVpnEditorPluginServiceFlags *out_flags)
 {
     NMVpnEditorPluginVT vt;
-    gs_free char *      short_name_local  = NULL;
-    gs_free char *      pretty_name_local = NULL;
-    gs_free char *      description_local = NULL;
+    gs_free char       *short_name_local  = NULL;
+    gs_free char       *pretty_name_local = NULL;
+    gs_free char       *description_local = NULL;
     guint               flags_local       = 0;
 
     g_return_val_if_fail(NM_IS_VPN_EDITOR_PLUGIN(plugin), FALSE);
@@ -94,7 +94,7 @@ static inline char **
 nm_vpn_editor_plugin_get_service_add_details(NMVpnEditorPlugin *plugin, const char *service_name)
 {
     NMVpnEditorPluginVT vt;
-    char **             details = NULL;
+    char              **details = NULL;
 
     g_return_val_if_fail(NM_IS_VPN_EDITOR_PLUGIN(plugin), NULL);
     g_return_val_if_fail(service_name, NULL);
@@ -109,19 +109,19 @@ nm_vpn_editor_plugin_get_service_add_details(NMVpnEditorPlugin *plugin, const ch
 
 static inline gboolean
 nm_vpn_editor_plugin_get_service_add_detail(NMVpnEditorPlugin *plugin,
-                                            const char *       service_type,
-                                            const char *       add_detail,
-                                            char **            out_pretty_name,
-                                            char **            out_description,
-                                            char **            out_add_detail_key,
-                                            char **            out_add_detail_val,
-                                            guint *            out_flags)
+                                            const char        *service_type,
+                                            const char        *add_detail,
+                                            char             **out_pretty_name,
+                                            char             **out_description,
+                                            char             **out_add_detail_key,
+                                            char             **out_add_detail_val,
+                                            guint             *out_flags)
 {
     NMVpnEditorPluginVT vt;
-    gs_free char *      pretty_name_local    = NULL;
-    gs_free char *      description_local    = NULL;
-    gs_free char *      add_detail_key_local = NULL;
-    gs_free char *      add_detail_val_local = NULL;
+    gs_free char       *pretty_name_local    = NULL;
+    gs_free char       *description_local    = NULL;
+    gs_free char       *add_detail_key_local = NULL;
+    gs_free char       *add_detail_val_local = NULL;
     guint               flags_local          = 0;
 
     g_return_val_if_fail(NM_IS_VPN_EDITOR_PLUGIN(plugin), FALSE);
diff --git a/src/contrib/nm-vpn-plugin-utils.c b/src/contrib/nm-vpn-plugin-utils.c
index b10695b7..32af40cf 100644
--- a/src/contrib/nm-vpn-plugin-utils.c
+++ b/src/contrib/nm-vpn-plugin-utils.c
@@ -12,22 +12,22 @@
 /*****************************************************************************/
 
 NMVpnEditor *
-nm_vpn_plugin_utils_load_editor(const char *                  module_name,
-                                const char *                  factory_name,
+nm_vpn_plugin_utils_load_editor(const char                   *module_name,
+                                const char                   *factory_name,
                                 NMVpnPluginUtilsEditorFactory editor_factory,
-                                NMVpnEditorPlugin *           editor_plugin,
-                                NMConnection *                connection,
+                                NMVpnEditorPlugin            *editor_plugin,
+                                NMConnection                 *connection,
                                 gpointer                      user_data,
-                                GError **                     error)
+                                GError                      **error)
 
 {
     static struct {
         gpointer factory;
-        void *   dl_module;
-        char *   module_name;
-        char *   factory_name;
+        void    *dl_module;
+        char    *module_name;
+        char    *factory_name;
     } cached = {0};
-    NMVpnEditor * editor;
+    NMVpnEditor  *editor;
     gs_free char *module_path = NULL;
     gs_free char *dirname     = NULL;
     Dl_info       plugin_info;
@@ -79,7 +79,7 @@ nm_vpn_plugin_utils_load_editor(const char *                  module_name,
                              NULL);
     } else {
         gpointer factory;
-        void *   dl_module;
+        void    *dl_module;
 
         dl_module = dlopen(module_path, RTLD_LAZY | RTLD_LOCAL);
         if (!dl_module) {
diff --git a/src/contrib/nm-vpn-plugin-utils.h b/src/contrib/nm-vpn-plugin-utils.h
index 288143ef..b27b7513 100644
--- a/src/contrib/nm-vpn-plugin-utils.h
+++ b/src/contrib/nm-vpn-plugin-utils.h
@@ -10,16 +10,16 @@
 
 typedef NMVpnEditor *(NMVpnPluginUtilsEditorFactory) (gpointer           factory,
                                                       NMVpnEditorPlugin *editor_plugin,
-                                                      NMConnection *     connection,
+                                                      NMConnection      *connection,
                                                       gpointer           user_data,
-                                                      GError **          error);
+                                                      GError           **error);
 
-NMVpnEditor *nm_vpn_plugin_utils_load_editor(const char *                  module_name,
-                                             const char *                  factory_name,
+NMVpnEditor *nm_vpn_plugin_utils_load_editor(const char                   *module_name,
+                                             const char                   *factory_name,
                                              NMVpnPluginUtilsEditorFactory editor_factory,
-                                             NMVpnEditorPlugin *           editor_plugin,
-                                             NMConnection *                connection,
+                                             NMVpnEditorPlugin            *editor_plugin,
+                                             NMConnection                 *connection,
                                              gpointer                      user_data,
-                                             GError **                     error);
+                                             GError                      **error);
 
 #endif /* __NM_VPN_PLUGIN_UTILS_H__ */