New upstream version 1.35.91 upstream/1.35.91

1 files changed, 39 insertions, 39 deletions

diff --git a/src/nmcli/settings.c b/src/nmcli/settings.c
index f4966400..c80d0c7c 100644
--- a/src/nmcli/settings.c
+++ b/src/nmcli/settings.c
@@ -24,8 +24,8 @@
 static gboolean
 get_answer(const char *prop, const char *value)
 {
-    char *   tmp_str;
-    char *   question;
+    char    *tmp_str;
+    char    *question;
     gboolean answer = FALSE;
 
     if (value)
@@ -226,7 +226,7 @@ proxy_method_changed_cb(GObject *object, GParamSpec *pspec, gpointer user_data)
 static void
 wireless_band_channel_changed_cb(GObject *object, GParamSpec *pspec, gpointer user_data)
 {
-    const char *       value = NULL, *mode;
+    const char        *value = NULL, *mode;
     char               str[16];
     NMSettingWireless *s_wireless = NM_SETTING_WIRELESS(object);
 
@@ -257,9 +257,9 @@ static void
 connection_master_changed_cb(GObject *object, GParamSpec *pspec, gpointer user_data)
 {
     NMSettingConnection *s_con      = NM_SETTING_CONNECTION(object);
-    NMConnection *       connection = NM_CONNECTION(user_data);
-    NMSetting *          s_ipv4, *s_ipv6;
-    const char *         value, *tmp_str;
+    NMConnection        *connection = NM_CONNECTION(user_data);
+    NMSetting           *s_ipv4, *s_ipv6;
+    const char          *value, *tmp_str;
 
     value = nm_setting_connection_get_master(s_con);
     if (value) {
@@ -350,16 +350,16 @@ nmc_setting_connection_connect_handlers(NMSettingConnection *setting, NMConnecti
 /*****************************************************************************/
 
 static gboolean
-_set_fcn_precheck_connection_secondaries(NMClient *  client,
+_set_fcn_precheck_connection_secondaries(NMClient   *client,
                                          const char *value,
-                                         char **     value_coerced,
-                                         GError **   error)
+                                         char      **value_coerced,
+                                         GError    **error)
 {
-    const GPtrArray *    connections;
-    NMConnection *       con;
+    const GPtrArray     *connections;
+    NMConnection        *con;
     gs_free const char **strv0 = NULL;
-    gs_strfreev char **  strv  = NULL;
-    char **              iter;
+    gs_strfreev char   **strv  = NULL;
+    char               **iter;
     gboolean             modified = FALSE;
 
     strv0 = nm_strsplit_set(value, " \t,");
@@ -419,7 +419,7 @@ _env_warn_fcn_handle(
         fmt_l10n, /* the untranslated format string, but it is marked for translation using N_(). */
     va_list ap)
 {
-    NmCli *       nmc = environment_user_data;
+    NmCli        *nmc = environment_user_data;
     gs_free char *m   = NULL;
 
     if (nmc->complete)
@@ -443,9 +443,9 @@ _env_warn_fcn_handle(
 static NMDevice *const *
 _env_get_nm_devices(const NMMetaEnvironment *environment,
                     gpointer                 environment_user_data,
-                    guint *                  out_len)
+                    guint                   *out_len)
 {
-    NmCli *          nmc = environment_user_data;
+    NmCli           *nmc = environment_user_data;
     const GPtrArray *devices;
 
     nm_assert(nmc);
@@ -467,9 +467,9 @@ _env_get_nm_devices(const NMMetaEnvironment *environment,
 static NMRemoteConnection *const *
 _env_get_nm_connections(const NMMetaEnvironment *environment,
                         gpointer                 environment_user_data,
-                        guint *                  out_len)
+                        guint                   *out_len)
 {
-    NmCli *          nmc = environment_user_data;
+    NmCli           *nmc = environment_user_data;
     const GPtrArray *values;
 
     nm_assert(nmc);
@@ -497,11 +497,11 @@ const NMMetaEnvironment *const nmc_meta_environment = &((NMMetaEnvironment){
 });
 
 static char *
-get_property_val(NMSetting *           setting,
-                 const char *          prop,
+get_property_val(NMSetting            *setting,
+                 const char           *prop,
                  NMMetaAccessorGetType get_type,
                  gboolean              show_secrets,
-                 GError **             error)
+                 GError              **error)
 {
     const NMMetaPropertyInfo *property_info;
 
@@ -514,8 +514,8 @@ get_property_val(NMSetting *           setting,
     if ((property_info = nm_meta_property_info_find_by_setting(setting, prop))) {
         if (property_info->property_type->get_fcn) {
             NMMetaAccessorGetOutFlags out_flags = NM_META_ACCESSOR_GET_OUT_FLAGS_NONE;
-            char *                    to_free   = NULL;
-            const char *              value;
+            char                     *to_free   = NULL;
+            const char               *value;
 
             value = property_info->property_type->get_fcn(
                 property_info,
@@ -560,15 +560,15 @@ nmc_setting_get_property_parsable(NMSetting *setting, const char *prop, GError *
 }
 
 gboolean
-nmc_setting_set_property(NMClient *             client,
-                         NMSetting *            setting,
-                         const char *           prop,
+nmc_setting_set_property(NMClient              *client,
+                         NMSetting             *setting,
+                         const char            *prop,
                          NMMetaAccessorModifier modifier,
-                         const char *           value,
-                         GError **              error)
+                         const char            *value,
+                         GError               **error)
 {
     const NMMetaPropertyInfo *property_info;
-    gs_free char *            value_to_free = NULL;
+    gs_free char             *value_to_free = NULL;
     gboolean                  success;
 
     g_return_val_if_fail(NM_IS_SETTING(setting), FALSE);
@@ -639,7 +639,7 @@ char **
 nmc_setting_get_valid_properties(NMSetting *setting)
 {
     const NMMetaSettingInfoEditor *setting_info;
-    char **                        valid_props;
+    char                         **valid_props;
     guint                          i, num;
 
     setting_info = nm_meta_setting_info_editor_find_by_setting(setting);
@@ -686,14 +686,14 @@ nmc_setting_get_property_allowed_values(NMSetting *setting, const char *prop, ch
 char *
 nmc_setting_get_property_desc(NMSetting *setting, const char *prop)
 {
-    gs_free char *            desc_to_free       = NULL;
-    const char *              setting_desc       = NULL;
-    const char *              setting_desc_title = "";
-    const char *              nmcli_desc         = NULL;
-    const char *              nmcli_desc_title   = "";
-    const char *              nmcli_nl           = "";
+    gs_free char             *desc_to_free       = NULL;
+    const char               *setting_desc       = NULL;
+    const char               *setting_desc_title = "";
+    const char               *nmcli_desc         = NULL;
+    const char               *nmcli_desc_title   = "";
+    const char               *nmcli_nl           = "";
     const NMMetaPropertyInfo *property_info;
-    const char *              desc = NULL;
+    const char               *desc = NULL;
 
     g_return_val_if_fail(NM_IS_SETTING(setting), FALSE);
 
@@ -732,8 +732,8 @@ gboolean
 setting_details(const NmcConfig *nmc_config, NMSetting *setting, const char *one_prop)
 {
     const NMMetaSettingInfoEditor *setting_info;
-    gs_free_error GError *error      = NULL;
-    gs_free char *        fields_str = NULL;
+    gs_free_error GError          *error      = NULL;
+    gs_free char                  *fields_str = NULL;
 
     g_return_val_if_fail(NM_IS_SETTING(setting), FALSE);