New upstream version 1.35.91 upstream/1.35.91

17 files changed, 1187 insertions, 1158 deletions

diff --git a/src/nmcli/agent.c b/src/nmcli/agent.c
index bdbd6e45..6d0fcfb5 100644
--- a/src/nmcli/agent.c
+++ b/src/nmcli/agent.c
@@ -56,7 +56,8 @@ usage_agent_all(void)
 
 static char *pre_input_deftext;
 
-static int set_deftext(_NMC_RL_STARTUPHOOK_ARGS)
+static int
+set_deftext(_NMC_RL_STARTUPHOOK_ARGS)
 {
     if (pre_input_deftext && rl_startup_hook) {
         rl_insert_text(pre_input_deftext);
@@ -68,16 +69,16 @@ static int set_deftext(_NMC_RL_STARTUPHOOK_ARGS)
 
 static gboolean
 get_secrets_from_user(const NmcConfig *nmc_config,
-                      const char *     request_id,
-                      const char *     title,
-                      const char *     msg,
-                      GPtrArray *      secrets)
+                      const char      *request_id,
+                      const char      *title,
+                      const char      *msg,
+                      GPtrArray       *secrets)
 {
     int i;
 
     for (i = 0; i < secrets->len; i++) {
         NMSecretAgentSimpleSecret *secret = secrets->pdata[i];
-        char *                     pwd    = NULL;
+        char                      *pwd    = NULL;
 
         /* Ask user for the password */
         if (msg)
@@ -103,13 +104,13 @@ get_secrets_from_user(const NmcConfig *nmc_config,
 
 static void
 secrets_requested(NMSecretAgentSimple *agent,
-                  const char *         request_id,
-                  const char *         title,
-                  const char *         msg,
-                  GPtrArray *          secrets,
+                  const char          *request_id,
+                  const char          *title,
+                  const char          *msg,
+                  GPtrArray           *secrets,
                   gpointer             user_data)
 {
-    NmCli *  nmc = user_data;
+    NmCli   *nmc = user_data;
     gboolean success;
 
     if (nmc->nmc_config.print_output == NMC_PRINT_PRETTY)
diff --git a/src/nmcli/common.c b/src/nmcli/common.c
index d9a981c3..26398c84 100644
--- a/src/nmcli/common.c
+++ b/src/nmcli/common.c
@@ -30,8 +30,8 @@ static char **
 _ip_config_get_routes(NMIPConfig *cfg)
 {
     gs_unref_hashtable GHashTable *hash = NULL;
-    GPtrArray *                    ptr_array;
-    char **                        arr;
+    GPtrArray                     *ptr_array;
+    char                         **arr;
     guint                          i;
 
     ptr_array = nm_ip_config_get_routes(cfg);
@@ -43,12 +43,12 @@ _ip_config_get_routes(NMIPConfig *cfg)
 
     arr = g_new(char *, ptr_array->len + 1);
     for (i = 0; i < ptr_array->len; i++) {
-        NMIPRoute *        route = g_ptr_array_index(ptr_array, i);
+        NMIPRoute         *route = g_ptr_array_index(ptr_array, i);
         gs_strfreev char **names = NULL;
         gsize              j;
-        GString *          str;
+        GString           *str;
         guint64            metric;
-        gs_free char *     attributes = NULL;
+        gs_free char      *attributes = NULL;
 
         str = g_string_new(NULL);
         g_string_append_printf(
@@ -92,14 +92,15 @@ _ip_config_get_routes(NMIPConfig *cfg)
 
 /*****************************************************************************/
 
-static gconstpointer _metagen_ip4_config_get_fcn(NMC_META_GENERIC_INFO_GET_FCN_ARGS)
+static gconstpointer
+_metagen_ip4_config_get_fcn(NMC_META_GENERIC_INFO_GET_FCN_ARGS)
 {
-    NMIPConfig *       cfg4 = target;
-    GPtrArray *        ptr_array;
-    char **            arr;
+    NMIPConfig        *cfg4 = target;
+    GPtrArray         *ptr_array;
+    char             **arr;
     const char *const *arrc;
     guint              i = 0;
-    const char *       str;
+    const char        *str;
 
     nm_assert(info->info_type < _NMC_GENERIC_INFO_TYPE_IP4_CONFIG_NUM);
 
@@ -185,14 +186,15 @@ const NmcMetaGenericInfo *const metagen_ip4_config[_NMC_GENERIC_INFO_TYPE_IP4_CO
 
 /*****************************************************************************/
 
-static gconstpointer _metagen_ip6_config_get_fcn(NMC_META_GENERIC_INFO_GET_FCN_ARGS)
+static gconstpointer
+_metagen_ip6_config_get_fcn(NMC_META_GENERIC_INFO_GET_FCN_ARGS)
 {
-    NMIPConfig *       cfg6 = target;
-    GPtrArray *        ptr_array;
-    char **            arr;
+    NMIPConfig        *cfg6 = target;
+    GPtrArray         *ptr_array;
+    char             **arr;
     const char *const *arrc;
     guint              i = 0;
-    const char *       str;
+    const char        *str;
 
     nm_assert(info->info_type < _NMC_GENERIC_INFO_TYPE_IP6_CONFIG_NUM);
 
@@ -272,18 +274,19 @@ const NmcMetaGenericInfo *const metagen_ip6_config[_NMC_GENERIC_INFO_TYPE_IP6_CO
 
 /*****************************************************************************/
 
-static gconstpointer _metagen_dhcp_config_get_fcn(NMC_META_GENERIC_INFO_GET_FCN_ARGS)
+static gconstpointer
+_metagen_dhcp_config_get_fcn(NMC_META_GENERIC_INFO_GET_FCN_ARGS)
 {
     NMDhcpConfig *dhcp = target;
     guint         i;
-    char **       arr = NULL;
+    char        **arr = NULL;
 
     NMC_HANDLE_COLOR(NM_META_COLOR_NONE);
 
     switch (info->info_type) {
     case NMC_GENERIC_INFO_TYPE_DHCP_CONFIG_OPTION:
     {
-        GHashTable *   table;
+        GHashTable    *table;
         gs_free char **arr2 = NULL;
         guint          n;
 
@@ -333,13 +336,13 @@ const NmcMetaGenericInfo *const metagen_dhcp_config[_NMC_GENERIC_INFO_TYPE_DHCP_
 /*****************************************************************************/
 
 gboolean
-print_ip_config(NMIPConfig *     cfg,
+print_ip_config(NMIPConfig      *cfg,
                 int              addr_family,
                 const NmcConfig *nmc_config,
-                const char *     one_field)
+                const char      *one_field)
 {
     gs_free_error GError *error     = NULL;
-    gs_free char *        field_str = NULL;
+    gs_free char         *field_str = NULL;
 
     if (!cfg)
         return FALSE;
@@ -364,13 +367,13 @@ print_ip_config(NMIPConfig *     cfg,
 }
 
 gboolean
-print_dhcp_config(NMDhcpConfig *   dhcp,
+print_dhcp_config(NMDhcpConfig    *dhcp,
                   int              addr_family,
                   const NmcConfig *nmc_config,
-                  const char *     one_field)
+                  const char      *one_field)
 {
     gs_free_error GError *error     = NULL;
-    gs_free char *        field_str = NULL;
+    gs_free char         *field_str = NULL;
 
     if (!dhcp)
         return FALSE;
@@ -416,16 +419,16 @@ print_dhcp_config(NMDhcpConfig *   dhcp,
  */
 NMConnection *
 nmc_find_connection(const GPtrArray *connections,
-                    const char *     filter_type,
-                    const char *     filter_val,
-                    GPtrArray **     out_result,
+                    const char      *filter_type,
+                    const char      *filter_val,
+                    GPtrArray      **out_result,
                     gboolean         complete)
 {
-    NMConnection *    best_candidate_uuid          = NULL;
-    NMConnection *    best_candidate               = NULL;
-    gs_unref_ptrarray GPtrArray *result_allocated  = NULL;
-    GPtrArray *                  result            = out_result ? *out_result : NULL;
-    const guint                  result_inital_len = result ? result->len : 0u;
+    NMConnection                *best_candidate_uuid = NULL;
+    NMConnection                *best_candidate      = NULL;
+    gs_unref_ptrarray GPtrArray *result_allocated    = NULL;
+    GPtrArray                   *result              = out_result ? *out_result : NULL;
+    const guint                  result_inital_len   = result ? result->len : 0u;
     guint                        i, j;
 
     nm_assert(connections);
@@ -434,8 +437,8 @@ nmc_find_connection(const GPtrArray *connections,
     for (i = 0; i < connections->len; i++) {
         gboolean      match_by_uuid = FALSE;
         NMConnection *connection;
-        const char *  v;
-        const char *  v_num;
+        const char   *v;
+        const char   *v_num;
 
         connection = NM_CONNECTION(connections->pdata[i]);
 
@@ -517,21 +520,21 @@ found:
 
 NMActiveConnection *
 nmc_find_active_connection(const GPtrArray *active_cons,
-                           const char *     filter_type,
-                           const char *     filter_val,
-                           GPtrArray **     out_result,
+                           const char      *filter_type,
+                           const char      *filter_val,
+                           GPtrArray      **out_result,
                            gboolean         complete)
 {
     guint               i, j;
     NMActiveConnection *best_candidate = NULL;
-    GPtrArray *         result         = out_result ? *out_result : NULL;
+    GPtrArray          *result         = out_result ? *out_result : NULL;
 
     nm_assert(filter_val);
 
     for (i = 0; i < active_cons->len; i++) {
         NMRemoteConnection *con;
         NMActiveConnection *candidate = g_ptr_array_index(active_cons, i);
-        const char *        v, *v_num;
+        const char         *v, *v_num;
 
         con = nm_active_connection_get_connection(candidate);
 
@@ -606,9 +609,9 @@ found:
 static gboolean
 vpn_openconnect_get_secrets(NMConnection *connection, GPtrArray *secrets)
 {
-    GError *      error = NULL;
+    GError       *error = NULL;
     NMSettingVpn *s_vpn;
-    const char *  gw, *port;
+    const char   *gw, *port;
     gs_free char *cookie  = NULL;
     gs_free char *gateway = NULL;
     gs_free char *gwcert  = NULL;
@@ -679,13 +682,13 @@ vpn_openconnect_get_secrets(NMConnection *connection, GPtrArray *secrets)
 
 static gboolean
 get_secrets_from_user(const NmcConfig *nmc_config,
-                      const char *     request_id,
-                      const char *     title,
-                      const char *     msg,
-                      NMConnection *   connection,
+                      const char      *request_id,
+                      const char      *title,
+                      const char      *msg,
+                      NMConnection    *connection,
                       gboolean         ask,
-                      GHashTable *     pwds_hash,
-                      GPtrArray *      secrets)
+                      GHashTable      *pwds_hash,
+                      GPtrArray       *secrets)
 {
     int i;
 
@@ -695,7 +698,7 @@ get_secrets_from_user(const NmcConfig *nmc_config,
 
     for (i = 0; i < secrets->len; i++) {
         NMSecretAgentSimpleSecret *secret = secrets->pdata[i];
-        char *                     pwd    = NULL;
+        char                      *pwd    = NULL;
 
         /* First try to find the password in provided passwords file,
          * then ask user. */
@@ -764,15 +767,15 @@ get_secrets_from_user(const NmcConfig *nmc_config,
 */
 void
 nmc_secrets_requested(NMSecretAgentSimple *agent,
-                      const char *         request_id,
-                      const char *         title,
-                      const char *         msg,
-                      GPtrArray *          secrets,
+                      const char          *request_id,
+                      const char          *title,
+                      const char          *msg,
+                      GPtrArray           *secrets,
                       gpointer             user_data)
 {
-    NmCli *          nmc        = (NmCli *) user_data;
-    NMConnection *   connection = NULL;
-    char *           path, *p;
+    NmCli           *nmc        = (NmCli *) user_data;
+    NMConnection    *connection = NULL;
+    char            *path, *p;
     gboolean         success = FALSE;
     const GPtrArray *connections;
 
@@ -814,8 +817,8 @@ char *
 nmc_unique_connection_name(const GPtrArray *connections, const char *try_name)
 {
     NMConnection *connection;
-    const char *  name;
-    char *        new_name;
+    const char   *name;
+    char         *new_name;
     unsigned      num = 1;
     int           i   = 0;
 
@@ -837,7 +840,7 @@ nmc_unique_connection_name(const GPtrArray *connections, const char *try_name)
 /* readline state variables */
 static gboolean nmcli_in_readline = FALSE;
 static gboolean rl_got_line;
-static char *   rl_string;
+static char    *rl_string;
 
 /**
  * nmc_cleanup_readline:
@@ -978,7 +981,7 @@ nmc_secret_redisplay(void)
 {
     int         save_point       = rl_point;
     int         save_end         = rl_end;
-    char *      save_line_buffer = rl_line_buffer;
+    char       *save_line_buffer = rl_line_buffer;
     const char *subst            = nmc_password_subst_char();
     int         subst_len        = strlen(subst);
     int         i;
@@ -1009,7 +1012,7 @@ nmc_readline_echo(const NmcConfig *nmc_config, gboolean echo_on, const char *pro
 {
     va_list       args;
     gs_free char *prompt = NULL;
-    char *        str;
+    char         *str;
 #if HAVE_READLINE_HISTORY
     nm_auto_free HISTORY_STATE *saved_history  = NULL;
     HISTORY_STATE               passwd_history = {
@@ -1129,8 +1132,8 @@ nmc_rl_gen_func_ifnames(const char *text, int state)
 {
     int              i;
     const GPtrArray *devices;
-    const char **    ifnames;
-    char *           ret;
+    const char     **ifnames;
+    char            *ret;
 
     devices = nm_client_get_devices(nm_cli_global_readline->client);
     if (devices->len == 0)
@@ -1138,7 +1141,7 @@ nmc_rl_gen_func_ifnames(const char *text, int state)
 
     ifnames = g_new(const char *, devices->len + 1);
     for (i = 0; i < devices->len; i++) {
-        NMDevice *  dev    = g_ptr_array_index(devices, i);
+        NMDevice   *dev    = g_ptr_array_index(devices, i);
         const char *ifname = nm_device_get_iface(dev);
         ifnames[i]         = ifname;
     }
@@ -1152,7 +1155,8 @@ nmc_rl_gen_func_ifnames(const char *text, int state)
 
 char *nmc_rl_pre_input_deftext;
 
-int nmc_rl_set_deftext(_NMC_RL_STARTUPHOOK_ARGS)
+int
+nmc_rl_set_deftext(_NMC_RL_STARTUPHOOK_ARGS)
 {
     if (nmc_rl_pre_input_deftext && rl_startup_hook) {
         rl_insert_text(nmc_rl_pre_input_deftext);
@@ -1186,7 +1190,7 @@ nmc_parse_lldp_capabilities(guint value)
                            "s-vlan-component",
                            "tpmr"};
     gboolean    first   = TRUE;
-    GString *   str;
+    GString    *str;
     int         i;
 
     if (!value)
@@ -1217,8 +1221,8 @@ nmc_parse_lldp_capabilities(guint value)
 static void
 command_done(GObject *object, GAsyncResult *res, gpointer user_data)
 {
-    GTask *       task          = G_TASK(res);
-    NmCli *       nmc           = user_data;
+    GTask                *task  = G_TASK(res);
+    NmCli                *nmc   = user_data;
     gs_free_error GError *error = NULL;
 
     if (!g_task_propagate_boolean(task, &error)) {
@@ -1233,8 +1237,8 @@ command_done(GObject *object, GAsyncResult *res, gpointer user_data)
 typedef struct {
     const NMCCommand *cmd;
     int               argc;
-    char **           argv;
-    GTask *           task;
+    char            **argv;
+    GTask            *task;
 } CmdCall;
 
 static void
@@ -1243,10 +1247,10 @@ call_cmd(NmCli *nmc, GTask *task, const NMCCommand *cmd, int argc, const char *c
 static void
 got_client(GObject *source_object, GAsyncResult *res, gpointer user_data)
 {
-    gs_unref_object GTask *task = NULL;
-    gs_free_error GError *error = NULL;
-    CmdCall *             call  = user_data;
-    NmCli *               nmc;
+    gs_unref_object GTask *task  = NULL;
+    gs_free_error GError  *error = NULL;
+    CmdCall               *call  = user_data;
+    NmCli                 *nmc;
 
     nm_assert(NM_IS_CLIENT(source_object));
 
@@ -1343,7 +1347,7 @@ nmc_complete_help(const char *prefix)
 void
 nmc_do_cmd(NmCli *nmc, const NMCCommand cmds[], const char *cmd, int argc, const char *const *argv)
 {
-    const NMCCommand *c;
+    const NMCCommand      *c;
     gs_unref_object GTask *task = NULL;
 
     task = nm_g_task_new(NULL, NULL, nmc_do_cmd, command_done, nmc);
diff --git a/src/nmcli/common.h b/src/nmcli/common.h
index 908dad06..1572c534 100644
--- a/src/nmcli/common.h
+++ b/src/nmcli/common.h
@@ -9,33 +9,33 @@
 #include "nmcli.h"
 #include "libnmc-base/nm-secret-agent-simple.h"
 
-gboolean print_ip_config(NMIPConfig *     cfg,
+gboolean print_ip_config(NMIPConfig      *cfg,
                          int              addr_family,
                          const NmcConfig *nmc_config,
-                         const char *     one_field);
+                         const char      *one_field);
 
-gboolean print_dhcp_config(NMDhcpConfig *   dhcp,
+gboolean print_dhcp_config(NMDhcpConfig    *dhcp,
                            int              addr_family,
                            const NmcConfig *nmc_config,
-                           const char *     one_field);
+                           const char      *one_field);
 
 NMConnection *nmc_find_connection(const GPtrArray *connections,
-                                  const char *     filter_type,
-                                  const char *     filter_val,
-                                  GPtrArray **     out_result,
+                                  const char      *filter_type,
+                                  const char      *filter_val,
+                                  GPtrArray      **out_result,
                                   gboolean         complete);
 
 NMActiveConnection *nmc_find_active_connection(const GPtrArray *active_cons,
-                                               const char *     filter_type,
-                                               const char *     filter_val,
-                                               GPtrArray **     out_result,
+                                               const char      *filter_type,
+                                               const char      *filter_val,
+                                               GPtrArray      **out_result,
                                                gboolean         complete);
 
 void nmc_secrets_requested(NMSecretAgentSimple *agent,
-                           const char *         request_id,
-                           const char *         title,
-                           const char *         msg,
-                           GPtrArray *          secrets,
+                           const char          *request_id,
+                           const char          *title,
+                           const char          *msg,
+                           GPtrArray           *secrets,
                            gpointer             user_data);
 
 char *nmc_unique_connection_name(const GPtrArray *connections, const char *try_name);
@@ -45,8 +45,8 @@ char *nmc_readline(const NmcConfig *nmc_config, const char *prompt_fmt, ...) G_G
 char *nmc_readline_echo(const NmcConfig *nmc_config, gboolean echo_on, const char *prompt_fmt, ...)
     G_GNUC_PRINTF(3, 4);
 NmcCompEntryFunc nmc_rl_compentry_func_wrap(const char *const *values);
-char *           nmc_rl_gen_func_basic(const char *text, int state, const char *const *words);
-char *           nmc_rl_gen_func_ifnames(const char *text, int state);
+char            *nmc_rl_gen_func_basic(const char *text, int state, const char *const *words);
+char            *nmc_rl_gen_func_ifnames(const char *text, int state);
 gboolean         nmc_get_in_readline(void);
 void             nmc_set_in_readline(gboolean in_readline);
 
diff --git a/src/nmcli/connections.c b/src/nmcli/connections.c
index 5edd33f0..5a66b82f 100644
--- a/src/nmcli/connections.c
+++ b/src/nmcli/connections.c
@@ -45,13 +45,13 @@ typedef char *(*CompEntryFunc)(const char *, int);
 
 typedef struct _OptionInfo {
     const NMMetaSettingInfoEditor *setting_info;
-    const char *                   property;
-    const char *                   option;
-    gboolean (*check_and_set)(NmCli *                   nmc,
-                              NMConnection *            connection,
+    const char                    *property;
+    const char                    *option;
+    gboolean (*check_and_set)(NmCli                    *nmc,
+                              NMConnection             *connection,
                               const struct _OptionInfo *option,
-                              const char *              value,
-                              GError **                 error);
+                              const char               *value,
+                              GError                  **error);
     CompEntryFunc generator_func;
 } OptionInfo;
 
@@ -100,9 +100,9 @@ static NM_UTILS_LOOKUP_STR_DEFINE(
 
 typedef struct {
     NmCli *nmc;
-    char * orig_id;
-    char * orig_uuid;
-    char * new_id;
+    char  *orig_id;
+    char  *orig_uuid;
+    char  *new_id;
 } AddConnectionInfo;
 
 static AddConnectionInfo *
@@ -189,10 +189,10 @@ active_connection_get_state_ord(NMActiveConnection *active)
 int
 nmc_active_connection_cmp(NMActiveConnection *ac_a, NMActiveConnection *ac_b)
 {
-    NMSettingIPConfig * s_ip;
+    NMSettingIPConfig  *s_ip;
     NMRemoteConnection *conn;
-    NMIPConfig *        da_ip;
-    NMIPConfig *        db_ip;
+    NMIPConfig         *da_ip;
+    NMIPConfig         *db_ip;
     int                 da_num_addrs;
     int                 db_num_addrs;
     int                 cmp = 0;
@@ -254,7 +254,7 @@ nmc_active_connection_cmp(NMActiveConnection *ac_a, NMActiveConnection *ac_b)
 static char *
 get_ac_device_string(NMActiveConnection *active)
 {
-    GString *        dev_str;
+    GString         *dev_str;
     const GPtrArray *devices;
     guint            i;
 
@@ -265,7 +265,7 @@ get_ac_device_string(NMActiveConnection *active)
     dev_str = g_string_new(NULL);
     devices = nm_active_connection_get_devices(active);
     for (i = 0; i < devices->len; i++) {
-        NMDevice *  device    = g_ptr_array_index(devices, i);
+        NMDevice   *device    = g_ptr_array_index(devices, i);
         const char *dev_iface = nm_device_get_iface(device);
 
         if (dev_iface) {
@@ -288,7 +288,7 @@ static const char *
 get_vpn_connection_type(NMConnection *connection)
 {
     NMSettingVpn *s_vpn;
-    const char *  type, *p;
+    const char   *type, *p;
 
     s_vpn = nm_connection_get_setting_vpn(connection);
     if (!s_vpn)
@@ -387,9 +387,9 @@ get_vpn_data_item(NMConnection *connection, enum VpnDataItem vpn_data_item)
 /*****************************************************************************/
 
 typedef struct {
-    NMConnection *      connection;
+    NMConnection       *connection;
     NMActiveConnection *primary_active;
-    GPtrArray *         all_active;
+    GPtrArray          *all_active;
     bool                show_active_fields;
 } MetagenConShowRowData;
 
@@ -422,7 +422,7 @@ _metagen_con_show_row_data_new_for_active_connection(NMRemoteConnection *connect
 
 static void
 _metagen_con_show_row_data_add_active_connection(MetagenConShowRowData *row_data,
-                                                 NMActiveConnection *   active)
+                                                 NMActiveConnection    *active)
 {
     if (!row_data->primary_active) {
         row_data->primary_active = g_object_ref(active);
@@ -477,7 +477,7 @@ static const char *
 _con_show_fcn_get_id(NMConnection *c, NMActiveConnection *ac)
 {
     NMSettingConnection *s_con = NULL;
-    const char *         s;
+    const char          *s;
 
     if (c)
         s_con = nm_connection_get_setting_connection(c);
@@ -499,7 +499,7 @@ static const char *
 _con_show_fcn_get_type(NMConnection *c, NMActiveConnection *ac, NMMetaAccessorGetType get_type)
 {
     NMSettingConnection *s_con = NULL;
-    const char *         s;
+    const char          *s;
 
     if (c)
         s_con = nm_connection_get_setting_connection(c);
@@ -513,14 +513,15 @@ _con_show_fcn_get_type(NMConnection *c, NMActiveConnection *ac, NMMetaAccessorGe
     return connection_type_to_display(s, get_type);
 }
 
-static gconstpointer _metagen_con_show_get_fcn(NMC_META_GENERIC_INFO_GET_FCN_ARGS)
+static gconstpointer
+_metagen_con_show_get_fcn(NMC_META_GENERIC_INFO_GET_FCN_ARGS)
 {
     const MetagenConShowRowData *row_data = target;
-    NMConnection *               c        = row_data->connection;
-    NMActiveConnection *         ac       = row_data->primary_active;
-    NMSettingConnection *        s_con    = NULL;
-    const char *                 s;
-    char *                       s_mut;
+    NMConnection                *c        = row_data->connection;
+    NMActiveConnection          *ac       = row_data->primary_active;
+    NMSettingConnection         *s_con    = NULL;
+    const char                  *s;
+    char                        *s_mut;
 
     NMC_HANDLE_COLOR(nmc_active_connection_state_to_color(ac));
 
@@ -654,14 +655,15 @@ const NmcMetaGenericInfo *const metagen_con_show[_NMC_GENERIC_INFO_TYPE_CON_SHOW
 
 /*****************************************************************************/
 
-static gconstpointer _metagen_con_active_general_get_fcn(NMC_META_GENERIC_INFO_GET_FCN_ARGS)
+static gconstpointer
+_metagen_con_active_general_get_fcn(NMC_META_GENERIC_INFO_GET_FCN_ARGS)
 {
-    NMActiveConnection * ac = target;
-    NMConnection *       c;
+    NMActiveConnection  *ac = target;
+    NMConnection        *c;
     NMSettingConnection *s_con = NULL;
-    NMDevice *           dev;
+    NMDevice            *dev;
     guint                i;
-    const char *         s;
+    const char          *s;
 
     NMC_HANDLE_COLOR(NM_META_COLOR_NONE);
 
@@ -680,14 +682,14 @@ static gconstpointer _metagen_con_active_general_get_fcn(NMC_META_GENERIC_INFO_G
     case NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_DEVICES:
     case NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_IP_IFACE:
     {
-        GString *        str = NULL;
+        GString         *str = NULL;
         const GPtrArray *devices;
 
         s       = NULL;
         devices = nm_active_connection_get_devices(ac);
         if (devices) {
             for (i = 0; i < devices->len; i++) {
-                NMDevice *  device = g_ptr_array_index(devices, i);
+                NMDevice   *device = g_ptr_array_index(devices, i);
                 const char *iface;
 
                 if (info->info_type == NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_DEVICES) {
@@ -767,15 +769,16 @@ const NmcMetaGenericInfo
 
 /*****************************************************************************/
 
-static gconstpointer _metagen_con_active_vpn_get_fcn(NMC_META_GENERIC_INFO_GET_FCN_ARGS)
+static gconstpointer
+_metagen_con_active_vpn_get_fcn(NMC_META_GENERIC_INFO_GET_FCN_ARGS)
 {
-    NMActiveConnection * ac = target;
-    NMConnection *       c;
-    NMSettingVpn *       s_vpn = NULL;
+    NMActiveConnection  *ac = target;
+    NMConnection        *c;
+    NMSettingVpn        *s_vpn = NULL;
     NMVpnConnectionState vpn_state;
     guint                i;
-    const char *         s;
-    char **              arr = NULL;
+    const char          *s;
+    char               **arr = NULL;
 
     nm_assert(NM_IS_VPN_CONNECTION(ac));
 
@@ -909,12 +912,12 @@ static guint progress_id = 0; /* ID of event source for displaying progress */
 
 /* for readline TAB completion in editor */
 typedef struct {
-    NmCli *       nmc;
-    char *        con_type;
+    NmCli        *nmc;
+    char         *con_type;
     NMConnection *connection;
-    NMSetting *   setting;
-    const char *  property;
-    char **       words;
+    NMSetting    *setting;
+    const char   *property;
+    char        **words;
 } TabCompletionInfo;
 
 static TabCompletionInfo nmc_tab_completion;
@@ -1291,12 +1294,12 @@ get_ac_for_connection_cmp(gconstpointer pa, gconstpointer pb)
 
 static NMActiveConnection *
 get_ac_for_connection(const GPtrArray *active_cons,
-                      NMConnection *   connection,
-                      GPtrArray **     out_result)
+                      NMConnection    *connection,
+                      GPtrArray      **out_result)
 {
     guint               i;
     NMActiveConnection *best_candidate = NULL;
-    GPtrArray *         result         = out_result ? *out_result : NULL;
+    GPtrArray          *result         = out_result ? *out_result : NULL;
 
     for (i = 0; i < active_cons->len; i++) {
         NMActiveConnection *candidate = g_ptr_array_index(active_cons, i);
@@ -1323,16 +1326,16 @@ get_ac_for_connection(const GPtrArray *active_cons,
 }
 
 typedef struct {
-    GMainLoop *   loop;
+    GMainLoop    *loop;
     NMConnection *local;
-    const char *  setting_name;
+    const char   *setting_name;
 } GetSecretsData;
 
 static void
 got_secrets(GObject *source_object, GAsyncResult *res, gpointer user_data)
 {
-    NMRemoteConnection *remote         = NM_REMOTE_CONNECTION(source_object);
-    GetSecretsData *    data           = user_data;
+    NMRemoteConnection        *remote  = NM_REMOTE_CONNECTION(source_object);
+    GetSecretsData            *data    = user_data;
     gs_unref_variant GVariant *secrets = NULL;
 
     secrets = nm_remote_connection_get_secrets_finish(remote, res, NULL);
@@ -1384,13 +1387,13 @@ update_secrets_in_connection(NMRemoteConnection *remote, NMConnection *local)
 static gboolean
 nmc_connection_profile_details(NMConnection *connection, NmCli *nmc)
 {
-    GError *    error = NULL;
-    GArray *    print_settings_array;
-    GPtrArray * prop_array = NULL;
+    GError     *error = NULL;
+    GArray     *print_settings_array;
+    GPtrArray  *prop_array = NULL;
     guint       i;
-    char *      fields_str;
-    char *      fields_all    = NMC_FIELDS_SETTINGS_NAMES_ALL;
-    char *      fields_common = NMC_FIELDS_SETTINGS_NAMES_ALL;
+    char       *fields_str;
+    char       *fields_all    = NMC_FIELDS_SETTINGS_NAMES_ALL;
+    char       *fields_common = NMC_FIELDS_SETTINGS_NAMES_ALL;
     const char *base_hdr      = _("Connection profile details");
     gboolean    was_output    = FALSE;
 
@@ -1417,9 +1420,9 @@ nmc_connection_profile_details(NMConnection *connection, NmCli *nmc)
 
     /* Main header */
     {
-        gs_free char *header_name          = NULL;
-        gs_free NmcOutputField *row        = NULL;
-        gs_unref_array GArray *out_indices = NULL;
+        gs_free char           *header_name = NULL;
+        gs_free NmcOutputField *row         = NULL;
+        gs_unref_array GArray  *out_indices = NULL;
 
         header_name = construct_header_name(base_hdr, nm_connection_get_id(connection));
         out_indices = parse_output_fields(
@@ -1444,7 +1447,7 @@ nmc_connection_profile_details(NMConnection *connection, NmCli *nmc)
 
     /* Loop through the required settings and print them. */
     for (i = 0; i < print_settings_array->len; i++) {
-        NMSetting * setting;
+        NMSetting  *setting;
         int         section_idx = g_array_index(print_settings_array, int, i);
         const char *prop_name   = (const char *) g_ptr_array_index(prop_array, i);
 
@@ -1496,12 +1499,12 @@ nmc_active_connection_state_to_color(NMActiveConnection *ac)
 static gboolean
 nmc_active_connection_details(NMActiveConnection *acon, NmCli *nmc)
 {
-    GError *    error = NULL;
-    GArray *    print_groups;
-    GPtrArray * group_fields = NULL;
+    GError     *error = NULL;
+    GArray     *print_groups;
+    GPtrArray  *group_fields = NULL;
     int         i;
     const char *fields_str = NULL;
-    const char *base_hdr   = _("Activate connection details");
+    const char *base_hdr   = _("Active connection details");
     gboolean    was_output = FALSE;
 
     if (!nmc->required_fields || g_ascii_strcasecmp(nmc->required_fields, "common") == 0) {
@@ -1527,9 +1530,9 @@ nmc_active_connection_details(NMActiveConnection *acon, NmCli *nmc)
 
     /* Main header */
     {
-        gs_free char *header_name          = NULL;
-        gs_free NmcOutputField *row        = NULL;
-        gs_unref_array GArray *out_indices = NULL;
+        gs_free char           *header_name = NULL;
+        gs_free NmcOutputField *row         = NULL;
+        gs_unref_array GArray  *out_indices = NULL;
 
         header_name = construct_header_name(base_hdr, nm_active_connection_get_uuid(acon));
         out_indices = parse_output_fields(
@@ -1648,12 +1651,12 @@ nmc_active_connection_details(NMActiveConnection *acon, NmCli *nmc)
 
 static gboolean
 split_required_fields_for_con_show(const char *input,
-                                   char **     profile_flds,
-                                   char **     active_flds,
-                                   GError **   error)
+                                   char      **profile_flds,
+                                   char      **active_flds,
+                                   GError    **error)
 {
-    gs_free const char **fields = NULL;
-    const char *const *  iter;
+    gs_free const char          **fields = NULL;
+    const char *const            *iter;
     nm_auto_free_gstring GString *str1          = NULL;
     nm_auto_free_gstring GString *str2          = NULL;
     gboolean                      group_profile = FALSE;
@@ -1671,8 +1674,8 @@ split_required_fields_for_con_show(const char *input,
 
     fields = nm_strsplit_set_with_empty(input, ",");
     for (iter = fields; iter && *iter; iter++) {
-        char *   s_mutable = (char *) (*iter);
-        char *   dot;
+        char    *s_mutable = (char *) (*iter);
+        char    *dot;
         gboolean is_all;
         gboolean is_common;
         gboolean found;
@@ -1789,7 +1792,7 @@ typedef enum {
 } NmcSortOrder;
 
 typedef struct {
-    NmCli *       nmc;
+    NmCli        *nmc;
     const GArray *order;
     gboolean      show_active_fields;
 } ConShowSortInfo;
@@ -1797,15 +1800,15 @@ typedef struct {
 static int
 con_show_get_items_cmp(gconstpointer pa, gconstpointer pb, gpointer user_data)
 {
-    const ConShowSortInfo *      sort_info      = user_data;
+    const ConShowSortInfo       *sort_info      = user_data;
     const MetagenConShowRowData *row_data_a     = *((const MetagenConShowRowData *const *) pa);
     const MetagenConShowRowData *row_data_b     = *((const MetagenConShowRowData *const *) pb);
-    NMConnection *               c_a            = row_data_a->connection;
-    NMConnection *               c_b            = row_data_b->connection;
-    NMActiveConnection *         ac_a           = row_data_a->primary_active;
-    NMActiveConnection *         ac_b           = row_data_b->primary_active;
-    NMActiveConnection *         ac_a_effective = sort_info->show_active_fields ? ac_a : NULL;
-    NMActiveConnection *         ac_b_effective = sort_info->show_active_fields ? ac_b : NULL;
+    NMConnection                *c_a            = row_data_a->connection;
+    NMConnection                *c_b            = row_data_b->connection;
+    NMActiveConnection          *ac_a           = row_data_a->primary_active;
+    NMActiveConnection          *ac_b           = row_data_b->primary_active;
+    NMActiveConnection          *ac_a_effective = sort_info->show_active_fields ? ac_a : NULL;
+    NMActiveConnection          *ac_b_effective = sort_info->show_active_fields ? ac_b : NULL;
 
     /* first sort active-connections which are invisible, i.e. that have no connection */
     if (!c_a && c_b)
@@ -1815,7 +1818,7 @@ con_show_get_items_cmp(gconstpointer pa, gconstpointer pb, gpointer user_data)
 
     /* we have two connections... */
     if (c_a && c_b && c_a != c_b) {
-        const NmcSortOrder *  order_arr;
+        const NmcSortOrder   *order_arr;
         guint                 i, order_len;
         NMMetaAccessorGetType get_type =
             nmc_print_output_to_accessor_get_type(sort_info->nmc->nmc_config.print_output);
@@ -1892,15 +1895,15 @@ con_show_get_items(NmCli *nmc, gboolean active_only, gboolean show_active_fields
 {
     gs_unref_hashtable GHashTable *row_hash = NULL;
     GHashTableIter                 hiter;
-    GPtrArray *                    result;
-    const GPtrArray *              arr;
-    NMRemoteConnection *           c;
-    MetagenConShowRowData *        row_data;
+    GPtrArray                     *result;
+    const GPtrArray               *arr;
+    NMRemoteConnection            *c;
+    MetagenConShowRowData         *row_data;
     guint                          i;
     const ConShowSortInfo          sort_info = {
-        .nmc                = nmc,
-        .order              = order,
-        .show_active_fields = show_active_fields,
+                 .nmc                = nmc,
+                 .order              = order,
+                 .show_active_fields = show_active_fields,
     };
 
     row_hash = g_hash_table_new(nm_direct_hash, NULL);
@@ -2003,9 +2006,9 @@ static GArray *
 parse_preferred_connection_order(const char *order, GError **error)
 {
     gs_free const char **strv = NULL;
-    const char *const *  iter;
-    const char *         str;
-    GArray *             order_arr;
+    const char *const   *iter;
+    const char          *str;
+    GArray              *order_arr;
     NmcSortOrder         val;
     gboolean             inverse, unique;
     guint                i;
@@ -2057,17 +2060,17 @@ parse_preferred_connection_order(const char *order, GError **error)
 }
 
 static NMConnection *
-get_connection(NmCli *             nmc,
-               int *               argc,
+get_connection(NmCli              *nmc,
+               int                *argc,
                const char *const **argv,
-               const char **       out_selector,
-               const char **       out_value,
-               GPtrArray **        out_result,
-               GError **           error)
+               const char        **out_selector,
+               const char        **out_value,
+               GPtrArray         **out_result,
+               GError            **error)
 {
     const GPtrArray *connections;
-    NMConnection *   connection = NULL;
-    const char *     selector   = NULL;
+    NMConnection    *connection = NULL;
+    const char      *selector   = NULL;
 
     NM_SET_OUT(out_selector, NULL);
     NM_SET_OUT(out_value, NULL);
@@ -2121,11 +2124,11 @@ get_connection(NmCli *             nmc,
 static void
 do_connections_show(const NMCCommand *cmd, NmCli *nmc, int argc, const char *const *argv)
 {
-    gs_free_error GError *err          = NULL;
-    gs_free char *        profile_flds = NULL;
-    gs_free char *        active_flds  = NULL;
-    gboolean              active_only  = FALSE;
-    gs_unref_array GArray *order       = NULL;
+    gs_free_error GError  *err          = NULL;
+    gs_free char          *profile_flds = NULL;
+    gs_free char          *active_flds  = NULL;
+    gboolean               active_only  = FALSE;
+    gs_unref_array GArray *order        = NULL;
     guint                  i;
     int                    option;
 
@@ -2153,8 +2156,8 @@ do_connections_show(const NMCCommand *cmd, NmCli *nmc, int argc, const char *con
     }
 
     if (argc == 0) {
-        const char *      fields_str                          = NULL;
-        gs_unref_ptrarray GPtrArray *items                    = NULL;
+        const char                        *fields_str         = NULL;
+        gs_unref_ptrarray GPtrArray       *items              = NULL;
         gs_free NMMetaSelectionResultList *selection          = NULL;
         gboolean                           show_active_fields = TRUE;
 
@@ -2242,14 +2245,14 @@ do_connections_show(const NMCCommand *cmd, NmCli *nmc, int argc, const char *con
         }
 
         while (argc > 0) {
-            const GPtrArray *connections;
-            gboolean         res;
-            NMConnection *   con;
-            gs_unref_object NMActiveConnection *explicit_acon  = NULL;
-            const char *                        selector       = NULL;
-            gs_unref_ptrarray GPtrArray *found_cons            = NULL;
-            gboolean                     explicit_acon_handled = FALSE;
-            guint                        i_found_cons;
+            const GPtrArray                    *connections;
+            gboolean                            res;
+            NMConnection                       *con;
+            gs_unref_object NMActiveConnection *explicit_acon         = NULL;
+            const char                         *selector              = NULL;
+            gs_unref_ptrarray GPtrArray        *found_cons            = NULL;
+            gboolean                            explicit_acon_handled = FALSE;
+            guint                               i_found_cons;
 
             if (argc == 1 && nmc->complete)
                 nmc_complete_strings(*argv, "id", "uuid", "path", "filename", "apath");
@@ -2396,9 +2399,9 @@ static NMActiveConnection *
 get_default_active_connection(NmCli *nmc, NMDevice **device)
 {
     NMActiveConnection *default_ac         = NULL;
-    NMDevice *          non_default_device = NULL;
+    NMDevice           *non_default_device = NULL;
     NMActiveConnection *non_default_ac     = NULL;
-    const GPtrArray *   connections;
+    const GPtrArray    *connections;
     guint               i;
 
     g_return_val_if_fail(nmc, NULL);
@@ -2408,7 +2411,7 @@ get_default_active_connection(NmCli *nmc, NMDevice **device)
     connections = nm_client_get_active_connections(nmc->client);
     for (i = 0; i < connections->len; i++) {
         NMActiveConnection *candidate = g_ptr_array_index(connections, i);
-        const GPtrArray *   devices;
+        const GPtrArray    *devices;
 
         devices = nm_active_connection_get_devices(candidate);
         if (!devices->len)
@@ -2447,17 +2450,17 @@ get_default_active_connection(NmCli *nmc, NMDevice **device)
  * RETURNS: TRUE when a device is found, FALSE otherwise.
  */
 static gboolean
-find_device_for_connection(NmCli *       nmc,
+find_device_for_connection(NmCli        *nmc,
                            NMConnection *connection,
-                           const char *  iface,
-                           const char *  ap,
-                           const char *  nsp,
-                           NMDevice **   device,
-                           const char ** spec_object,
-                           GError **     error)
+                           const char   *iface,
+                           const char   *ap,
+                           const char   *nsp,
+                           NMDevice    **device,
+                           const char  **spec_object,
+                           GError      **error)
 {
     NMSettingConnection *s_con;
-    const char *         con_type;
+    const char          *con_type;
     guint                i, j;
 
     g_return_val_if_fail(nmc, FALSE);
@@ -2495,7 +2498,7 @@ find_device_for_connection(NmCli *       nmc,
         }
     } else {
         /* Other connections */
-        NMDevice *       found_device           = NULL;
+        NMDevice        *found_device           = NULL;
         const GPtrArray *devices                = nm_client_get_devices(nmc->client);
         gboolean         found_device_with_name = FALSE;
 
@@ -2524,14 +2527,14 @@ find_device_for_connection(NmCli *       nmc,
             found_device = dev;
             if (ap && nm_streq(con_type, NM_SETTING_WIRELESS_SETTING_NAME)
                 && NM_IS_DEVICE_WIFI(dev)) {
-                gs_free char *   bssid_up = g_ascii_strup(ap, -1);
+                gs_free char    *bssid_up = g_ascii_strup(ap, -1);
                 const GPtrArray *aps      = nm_device_wifi_get_access_points(NM_DEVICE_WIFI(dev));
                 found_device =
                     NULL; /* Mark as not found; set to the device again later, only if AP matches */
 
                 for (j = 0; j < aps->len; j++) {
                     NMAccessPoint *candidate_ap    = g_ptr_array_index(aps, j);
-                    const char *   candidate_bssid = nm_access_point_get_bssid(candidate_ap);
+                    const char    *candidate_bssid = nm_access_point_get_bssid(candidate_ap);
 
                     if (nm_streq0(bssid_up, candidate_bssid)) {
                         found_device = dev;
@@ -2575,17 +2578,17 @@ find_device_for_connection(NmCli *       nmc,
 }
 
 typedef struct {
-    NmCli *             nmc;
-    NMDevice *          device;
+    NmCli              *nmc;
+    NMDevice           *device;
     NMActiveConnection *active;
 } ActivateConnectionInfo;
 
 static void
 active_connection_hint(GString *return_text, NMActiveConnection *active, NMDevice *device)
 {
-    NMRemoteConnection * connection;
+    NMRemoteConnection           *connection;
     nm_auto_free_gstring GString *hint = NULL;
-    const GPtrArray *             devices;
+    const GPtrArray              *devices;
     guint                         i;
 
     if (!active)
@@ -2623,8 +2626,8 @@ static void
 check_activated(ActivateConnectionInfo *info)
 {
     NMActiveConnectionState ac_state;
-    NmCli *                 nmc    = info->nmc;
-    const char *            reason = NULL;
+    NmCli                  *nmc    = info->nmc;
+    const char             *reason = NULL;
 
     ac_state = nmc_activation_get_effective_state(info->active, info->device, &reason);
     switch (ac_state) {
@@ -2668,10 +2671,10 @@ device_state_cb(NMDevice *device, GParamSpec *pspec, ActivateConnectionInfo *inf
 }
 
 static void
-active_connection_state_cb(NMActiveConnection *          active,
+active_connection_state_cb(NMActiveConnection           *active,
                            NMActiveConnectionState       state,
                            NMActiveConnectionStateReason reason,
-                           ActivateConnectionInfo *      info)
+                           ActivateConnectionInfo       *info)
 {
     check_activated(info);
 }
@@ -2707,11 +2710,11 @@ progress_cb(gpointer user_data)
 static gboolean
 progress_active_connection_cb(gpointer user_data)
 {
-    NMActiveConnection *    active = user_data;
-    const char *            str;
-    NMDevice *              device;
+    NMActiveConnection     *active = user_data;
+    const char             *str;
+    NMDevice               *device;
     NMActiveConnectionState ac_state;
-    const GPtrArray *       ac_devs;
+    const GPtrArray        *ac_devs;
 
     ac_state = nm_active_connection_get_state(active);
 
@@ -2755,12 +2758,12 @@ static void
 activate_connection_cb(GObject *client, GAsyncResult *result, gpointer user_data)
 {
     ActivateConnectionInfo *info   = (ActivateConnectionInfo *) user_data;
-    NmCli *                 nmc    = info->nmc;
-    NMDevice *              device = info->device;
-    NMActiveConnection *    active;
+    NmCli                  *nmc    = info->nmc;
+    NMDevice               *device = info->device;
+    NMActiveConnection     *active;
     NMActiveConnectionState state;
-    const GPtrArray *       ac_devs;
-    GError *                error = NULL;
+    const GPtrArray        *ac_devs;
+    GError                 *error = NULL;
 
     info->active = active = nm_client_activate_connection_finish(NM_CLIENT(client), result, &error);
 
@@ -2820,19 +2823,19 @@ activate_connection_cb(GObject *client, GAsyncResult *result, gpointer user_data
 }
 
 static gboolean
-nmc_activate_connection(NmCli *             nmc,
-                        NMConnection *      connection,
-                        const char *        ifname,
-                        const char *        ap,
-                        const char *        nsp,
-                        const char *        pwds,
+nmc_activate_connection(NmCli              *nmc,
+                        NMConnection       *connection,
+                        const char         *ifname,
+                        const char         *ap,
+                        const char         *nsp,
+                        const char         *pwds,
                         GAsyncReadyCallback callback,
-                        GError **           error)
+                        GError            **error)
 {
     ActivateConnectionInfo *info;
 
     GHashTable *pwds_hash;
-    NMDevice *  device      = NULL;
+    NMDevice   *device      = NULL;
     const char *spec_object = NULL;
     gboolean    device_found;
 
@@ -2930,16 +2933,16 @@ nmc_activate_connection(NmCli *             nmc,
 static void
 do_connection_up(const NMCCommand *cmd, NmCli *nmc, int argc, const char *const *argv)
 {
-    NMConnection *connection      = NULL;
-    const char *  ifname          = NULL;
-    const char *  ap              = NULL;
-    const char *  nsp             = NULL;
-    const char *  pwds            = NULL;
-    gs_free_error GError *error   = NULL;
-    gs_strfreev char **   arg_arr = NULL;
+    NMConnection         *connection = NULL;
+    const char           *ifname     = NULL;
+    const char           *ap         = NULL;
+    const char           *nsp        = NULL;
+    const char           *pwds       = NULL;
+    gs_free_error GError *error      = NULL;
+    gs_strfreev char    **arg_arr    = NULL;
     int                   arg_num;
-    const char *const **  argv_ptr;
-    int *                 argc_ptr;
+    const char *const   **argv_ptr;
+    int                  *argc_ptr;
 
     /*
      * Set default timeout for connection activation.
@@ -3058,7 +3061,7 @@ typedef struct {
     NmCli *nmc;
     /* a list of object that is relevant for the callback. The object
      * type differs, and depends on the type of callback. */
-    GPtrArray *   obj_list;
+    GPtrArray    *obj_list;
     guint         timeout_id;
     GCancellable *cancellable;
 } ConnectionCbInfo;
@@ -3067,8 +3070,8 @@ static void
 connection_removed_cb(NMClient *client, NMConnection *connection, ConnectionCbInfo *info);
 
 static void down_active_connection_state_cb(NMActiveConnection *active,
-                                            GParamSpec *        pspec,
-                                            ConnectionCbInfo *  info);
+                                            GParamSpec         *pspec,
+                                            ConnectionCbInfo   *info);
 
 static void
 connection_cb_info_obj_list_destroy(ConnectionCbInfo *info, gpointer obj)
@@ -3165,8 +3168,8 @@ connection_removed_cb(NMClient *client, NMConnection *connection, ConnectionCbIn
 
 static void
 down_active_connection_state_cb(NMActiveConnection *active,
-                                GParamSpec *        pspec,
-                                ConnectionCbInfo *  info)
+                                GParamSpec         *pspec,
+                                ConnectionCbInfo   *info)
 {
     if (nm_active_connection_get_state(active) < NM_ACTIVE_CONNECTION_STATE_DEACTIVATED)
         return;
@@ -3194,13 +3197,13 @@ connection_op_timeout_cb(gpointer user_data)
 static void
 do_connection_down(const NMCCommand *cmd, NmCli *nmc, int argc, const char *const *argv)
 {
-    NMActiveConnection *active;
-    ConnectionCbInfo *  info = NULL;
-    const GPtrArray *   active_cons;
-    gs_strfreev char ** arg_arr = NULL;
-    const char *const * arg_ptr;
-    int                 arg_num;
-    guint               i;
+    NMActiveConnection          *active;
+    ConnectionCbInfo            *info = NULL;
+    const GPtrArray             *active_cons;
+    gs_strfreev char           **arg_arr = NULL;
+    const char *const           *arg_ptr;
+    int                          arg_num;
+    guint                        i;
     gs_unref_ptrarray GPtrArray *found_active_cons = NULL;
 
     if (nmc->timeout == -1)
@@ -3351,7 +3354,7 @@ get_valid_options_string(const NMMetaSettingValidPartItem *const *array,
                          const NMMetaSettingValidPartItem *const *array_slv)
 {
     const NMMetaSettingValidPartItem *const *iter = array;
-    GString *                                str;
+    GString                                 *str;
     int                                      i;
 
     str = g_string_sized_new(150);
@@ -3422,8 +3425,8 @@ get_valid_settings_array(const char *con_type)
 }
 
 static char *
-_construct_property_name(const char *           setting_name,
-                         const char *           property_name,
+_construct_property_name(const char            *setting_name,
+                         const char            *property_name,
                          NMMetaAccessorModifier modifier)
 {
     return g_strdup_printf("%s%s.%s\n",
@@ -3452,12 +3455,12 @@ static char *
 get_valid_properties_string(const NMMetaSettingValidPartItem *const *array,
                             const NMMetaSettingValidPartItem *const *array_slv,
                             NMMetaAccessorModifier                   modifier,
-                            const char *                             prefix,
-                            const char *                             postfix)
+                            const char                              *prefix,
+                            const char                              *postfix)
 {
     const NMMetaSettingValidPartItem *const *iter      = array;
-    const char *                             prop_name = NULL;
-    GString *                                str;
+    const char                              *prop_name = NULL;
+    GString                                 *str;
     guint                                    i, j;
     gboolean                                 full_match = FALSE;
 
@@ -3493,7 +3496,7 @@ get_valid_properties_string(const NMMetaSettingValidPartItem *const *array,
             /* Search the array with the arguments of the current property */
             for (j = 0; j < setting_info->properties_num; j++) {
                 gs_free char *ss1 = NULL;
-                const char *  arg_name;
+                const char   *arg_name;
 
                 arg_name = setting_info->properties[j]->property_name;
 
@@ -3526,16 +3529,16 @@ get_valid_properties_string(const NMMetaSettingValidPartItem *const *array,
  * The returned string must not be freed.
  */
 static const char *
-check_valid_name(const char *                             val,
+check_valid_name(const char                              *val,
                  const NMMetaSettingValidPartItem *const *array,
                  const NMMetaSettingValidPartItem *const *array_slv,
-                 GError **                                error)
+                 GError                                 **error)
 {
     const NMMetaSettingValidPartItem *const *iter;
-    gs_unref_ptrarray GPtrArray *tmp_arr = NULL;
-    const char *                 str;
-    GError *                     tmp_err = NULL;
-    int                          i;
+    gs_unref_ptrarray GPtrArray             *tmp_arr = NULL;
+    const char                              *str;
+    GError                                  *tmp_err = NULL;
+    int                                      i;
 
     g_return_val_if_fail(array, NULL);
 
@@ -3590,11 +3593,11 @@ check_valid_name(const char *                             val,
 static const char *
 check_valid_name_toplevel(const char *val, const char **slave_type, GError **error)
 {
-    gs_unref_ptrarray GPtrArray *  tmp_arr = NULL;
+    gs_unref_ptrarray GPtrArray   *tmp_arr = NULL;
     const NMMetaSettingInfoEditor *setting_info;
-    gs_free_error GError *tmp_err = NULL;
-    const char *          str;
-    int                   i;
+    gs_free_error GError          *tmp_err = NULL;
+    const char                    *str;
+    int                            i;
 
     NM_SET_OUT(slave_type, NULL);
 
@@ -3649,11 +3652,11 @@ check_valid_name_toplevel(const char *val, const char **slave_type, GError **err
 static gboolean
 is_setting_mandatory(NMConnection *connection, NMSetting *setting)
 {
-    NMSettingConnection *                    s_con;
-    const char *                             c_type;
+    NMSettingConnection                     *s_con;
+    const char                              *c_type;
     const NMMetaSettingValidPartItem *const *item;
-    const char *                             name;
-    const char *                             s_type;
+    const char                              *name;
+    const char                              *s_type;
     guint                                    i;
 
     s_con = nm_connection_get_setting_connection(connection);
@@ -3716,17 +3719,17 @@ _strip_master_prefix(const char *master, const char *(**func)(NMConnection *) )
  */
 static const char *
 normalized_master_for_slave(const GPtrArray *connections,
-                            const char *     master,
-                            const char *     type,
-                            const char **    out_type)
+                            const char      *master,
+                            const char      *type,
+                            const char     **out_type)
 {
-    NMConnection *       connection;
+    NMConnection        *connection;
     NMSettingConnection *s_con;
-    const char *         con_type = NULL, *id, *uuid, *ifname;
+    const char          *con_type = NULL, *id, *uuid, *ifname;
     guint                i;
-    const char *         found_by_id    = NULL;
-    const char *         out_type_by_id = NULL;
-    const char *         out_master     = NULL;
+    const char          *found_by_id    = NULL;
+    const char          *out_type_by_id = NULL;
+    const char          *out_master     = NULL;
     const char *(*func)(NMConnection *) = NULL;
 
     if (!master)
@@ -3806,10 +3809,10 @@ prompt_yes_no(gboolean default_yes, char *delim)
 }
 
 static NMSetting *
-is_setting_valid(NMConnection *                           connection,
+is_setting_valid(NMConnection                            *connection,
                  const NMMetaSettingValidPartItem *const *valid_settings_main,
                  const NMMetaSettingValidPartItem *const *valid_settings_slave,
-                 const char *                             setting)
+                 const char                              *setting)
 {
     const char *setting_name;
 
@@ -3823,7 +3826,7 @@ static char *
 is_property_valid(NMSetting *setting, const char *property, GError **error)
 {
     gs_strfreev char **valid_props = NULL;
-    const char *       prop_name;
+    const char        *prop_name;
 
     valid_props = nmc_setting_get_valid_properties(setting);
     prop_name   = nmc_string_is_valid(property, (const char **) valid_props, error);
@@ -3876,7 +3879,7 @@ set_default_interface_name(NmCli *nmc, NMSettingConnection *s_con)
 
     if (default_name) {
         const GPtrArray *connections;
-        gs_free char *   ifname = NULL;
+        gs_free char    *ifname = NULL;
 
         connections = nm_client_get_connections(nmc->client);
         ifname      = unique_master_iface_ifname(connections, default_name);
@@ -3932,10 +3935,10 @@ _meta_property_needs_bond_hack(const NMMetaPropertyInfo *property_info)
 static char **
 _meta_abstract_complete(const NMMetaAbstractInfo *abstract_info, const char *text)
 {
-    const char *const *          values;
-    char **                      values_to_free = NULL;
+    const char *const           *values;
+    char                       **values_to_free = NULL;
     const NMMetaOperationContext ctx            = {
-        .connection = nmc_tab_completion.connection,
+                   .connection = nmc_tab_completion.connection,
     };
 
     values = nm_meta_abstract_info_complete(abstract_info,
@@ -3961,14 +3964,14 @@ _meta_abstract_generator(const char *text, int state)
 }
 
 static void
-_meta_abstract_get(const NMMetaAbstractInfo *      abstract_info,
+_meta_abstract_get(const NMMetaAbstractInfo       *abstract_info,
                    const NMMetaSettingInfoEditor **out_setting_info,
-                   const char **                   out_setting_name,
-                   const char **                   out_property_name,
-                   const char **                   out_option,
-                   NMMetaPropertyInfFlags *        out_inf_flags,
-                   const char **                   out_prompt,
-                   const char **                   out_def_hint)
+                   const char                    **out_setting_name,
+                   const char                    **out_property_name,
+                   const char                    **out_option,
+                   NMMetaPropertyInfFlags         *out_inf_flags,
+                   const char                    **out_prompt,
+                   const char                    **out_def_hint)
 {
     const NMMetaPropertyInfo *info = (const NMMetaPropertyInfo *) abstract_info;
 
@@ -4031,7 +4034,7 @@ enable_options(const char *setting_name, const char *property, const char *const
 static void
 disable_options(const char *setting_name, const char *property)
 {
-    const NMMetaPropertyInfo *       property_infos_local[2];
+    const NMMetaPropertyInfo        *property_infos_local[2];
     const NMMetaPropertyInfo *const *property_infos;
     guint                            p;
 
@@ -4119,17 +4122,17 @@ reset_options(void)
 }
 
 static gboolean
-set_property(NMClient *             client,
-             NMConnection *         connection,
-             const char *           setting_name,
-             const char *           property,
-             const char *           value,
+set_property(NMClient              *client,
+             NMConnection          *connection,
+             const char            *setting_name,
+             const char            *property,
+             const char            *value,
              NMMetaAccessorModifier modifier,
-             GError **              error)
+             GError               **error)
 {
-    gs_free char *property_name = NULL;
-    gs_free_error GError *local = NULL;
-    NMSetting *           setting;
+    gs_free char         *property_name = NULL;
+    gs_free_error GError *local         = NULL;
+    NMSetting            *setting;
 
     nm_assert(setting_name && setting_name[0]);
     nm_assert(NM_IN_SET(modifier,
@@ -4182,15 +4185,15 @@ set_property(NMClient *             client,
 }
 
 static gboolean
-set_option(NmCli *                   nmc,
-           NMConnection *            connection,
+set_option(NmCli                    *nmc,
+           NMConnection             *connection,
            const NMMetaAbstractInfo *abstract_info,
-           const char *              value,
-           GError **                 error)
+           const char               *value,
+           GError                  **error)
 {
-    const char *           setting_name, *property_name, *option_name;
+    const char            *setting_name, *property_name, *option_name;
     NMMetaPropertyInfFlags inf_flags;
-    const OptionInfo *     option;
+    const OptionInfo      *option;
 
     option = _meta_abstract_get_option_info(abstract_info);
 
@@ -4227,12 +4230,12 @@ set_option(NmCli *                   nmc,
  * and slave type.
  */
 static gboolean
-con_settings(NMConnection *                            connection,
+con_settings(NMConnection                             *connection,
              const NMMetaSettingValidPartItem *const **type_settings,
              const NMMetaSettingValidPartItem *const **slv_settings,
-             GError **                                 error)
+             GError                                  **error)
 {
-    const char *         con_type;
+    const char          *con_type;
     NMSettingConnection *s_con;
 
     g_return_val_if_fail(type_settings, FALSE);
@@ -4332,17 +4335,17 @@ gen_func_bond_lacp_rate(const char *text, int state)
 /*****************************************************************************/
 
 static gboolean
-set_connection_type(NmCli *           nmc,
-                    NMConnection *    con,
+set_connection_type(NmCli            *nmc,
+                    NMConnection     *con,
                     const OptionInfo *option,
-                    const char *      value,
-                    GError **         error)
+                    const char       *value,
+                    GError          **error)
 {
     const NMMetaSettingValidPartItem *const *type_settings;
     const NMMetaSettingValidPartItem *const *slv_settings;
-    GError *                                 local      = NULL;
-    const char *                             master[]   = {"master", NULL};
-    const char *                             slave_type = NULL;
+    GError                                  *local      = NULL;
+    const char                              *master[]   = {"master", NULL};
+    const char                              *slave_type = NULL;
 
     value = check_valid_name_toplevel(value, &slave_type, &local);
     if (!value) {
@@ -4396,11 +4399,11 @@ set_connection_type(NmCli *           nmc,
 }
 
 static gboolean
-set_connection_iface(NmCli *           nmc,
-                     NMConnection *    con,
+set_connection_iface(NmCli            *nmc,
+                     NMConnection     *con,
                      const OptionInfo *option,
-                     const char *      value,
-                     GError **         error)
+                     const char       *value,
+                     GError          **error)
 {
     if (value) {
         /* Special value of '*' means no specific interface name */
@@ -4418,15 +4421,15 @@ set_connection_iface(NmCli *           nmc,
 }
 
 static gboolean
-set_connection_master(NmCli *           nmc,
-                      NMConnection *    con,
+set_connection_master(NmCli            *nmc,
+                      NMConnection     *con,
                       const OptionInfo *option,
-                      const char *      value,
-                      GError **         error)
+                      const char       *value,
+                      GError          **error)
 {
-    const GPtrArray *    connections;
+    const GPtrArray     *connections;
     NMSettingConnection *s_con;
-    const char *         slave_type;
+    const char          *slave_type;
 
     s_con = nm_connection_get_setting_connection(con);
     g_return_val_if_fail(s_con, FALSE);
@@ -4463,16 +4466,16 @@ set_connection_master(NmCli *           nmc,
 }
 
 static gboolean
-set_bond_option(NmCli *           nmc,
-                NMConnection *    con,
+set_bond_option(NmCli            *nmc,
+                NMConnection     *con,
                 const OptionInfo *option,
-                const char *      value,
-                GError **         error)
+                const char       *value,
+                GError          **error)
 {
     NMSettingBond *s_bond;
     gboolean       success;
-    gs_free char * name = NULL;
-    char *         p;
+    gs_free char  *name = NULL;
+    char          *p;
 
     s_bond = nm_connection_get_setting_bond(con);
     g_return_val_if_fail(s_bond, FALSE);
@@ -4507,16 +4510,16 @@ set_bond_option(NmCli *           nmc,
 }
 
 static gboolean
-set_bond_monitoring_mode(NmCli *           nmc,
-                         NMConnection *    con,
+set_bond_monitoring_mode(NmCli            *nmc,
+                         NMConnection     *con,
                          const OptionInfo *option,
-                         const char *      value,
-                         GError **         error)
+                         const char       *value,
+                         GError          **error)
 {
     NMSettingBond *s_bond;
-    gs_free char * monitor_mode  = NULL;
-    const char *   miimon_opts[] = {"miimon", "downdelay", "updelay", NULL};
-    const char *   arp_opts[]    = {"arp-interval", "arp-ip-target", NULL};
+    gs_free char  *monitor_mode  = NULL;
+    const char    *miimon_opts[] = {"miimon", "downdelay", "updelay", NULL};
+    const char    *arp_opts[]    = {"arp-interval", "arp-ip-target", NULL};
 
     s_bond = nm_connection_get_setting_bond(con);
     g_return_val_if_fail(s_bond, FALSE);
@@ -4547,11 +4550,11 @@ set_bond_monitoring_mode(NmCli *           nmc,
 }
 
 static gboolean
-set_bluetooth_type(NmCli *           nmc,
-                   NMConnection *    con,
+set_bluetooth_type(NmCli            *nmc,
+                   NMConnection     *con,
                    const OptionInfo *option,
-                   const char *      value,
-                   GError **         error)
+                   const char       *value,
+                   GError          **error)
 {
     NMSetting *setting;
 
@@ -4595,11 +4598,11 @@ set_bluetooth_type(NmCli *           nmc,
 }
 
 static gboolean
-set_ip4_address(NmCli *           nmc,
-                NMConnection *    con,
+set_ip4_address(NmCli            *nmc,
+                NMConnection     *con,
                 const OptionInfo *option,
-                const char *      value,
-                GError **         error)
+                const char       *value,
+                GError          **error)
 {
     NMSettingIPConfig *s_ip4;
 
@@ -4622,11 +4625,11 @@ set_ip4_address(NmCli *           nmc,
 }
 
 static gboolean
-set_ip6_address(NmCli *           nmc,
-                NMConnection *    con,
+set_ip6_address(NmCli            *nmc,
+                NMConnection     *con,
                 const OptionInfo *option,
-                const char *      value,
-                GError **         error)
+                const char       *value,
+                GError          **error)
 {
     NMSettingIPConfig *s_ip6;
 
@@ -4703,9 +4706,9 @@ _meta_abstract_get_option_info(const NMMetaAbstractInfo *abstract_info)
         OPTION_INFO(IP6_CONFIG, NM_SETTING_IP_CONFIG_ADDRESSES, "ip6", set_ip6_address, NULL),
         {0},
     };
-    const char *                   property_name, *option;
+    const char                    *property_name, *option;
     const NMMetaSettingInfoEditor *setting_info;
-    const OptionInfo *             candidate;
+    const OptionInfo              *candidate;
 
     _meta_abstract_get(abstract_info,
                        &setting_info,
@@ -4728,7 +4731,7 @@ _meta_abstract_get_option_info(const NMMetaAbstractInfo *abstract_info)
 static gboolean
 option_relevant(NMConnection *connection, const NMMetaAbstractInfo *abstract_info)
 {
-    const char *           setting_name;
+    const char            *setting_name;
     NMMetaPropertyInfFlags inf_flags;
 
     _meta_abstract_get(abstract_info, NULL, &setting_name, NULL, NULL, &inf_flags, NULL, NULL);
@@ -4746,18 +4749,18 @@ option_relevant(NMConnection *connection, const NMMetaAbstractInfo *abstract_inf
 /*****************************************************************************/
 
 static void
-complete_property_name(NmCli *                nmc,
-                       NMConnection *         connection,
+complete_property_name(NmCli                 *nmc,
+                       NMConnection          *connection,
                        NMMetaAccessorModifier modifier,
-                       const char *           prefix,
-                       const char *           postfix)
+                       const char            *prefix,
+                       const char            *postfix)
 {
-    NMSettingConnection *                    s_con;
+    NMSettingConnection                     *s_con;
     const NMMetaSettingValidPartItem *const *valid_settings_main;
     const NMMetaSettingValidPartItem *const *valid_settings_slave;
-    const char *                             connection_type = NULL;
-    const char *                             slave_type      = NULL;
-    gs_free char *                           word_list       = NULL;
+    const char                              *connection_type = NULL;
+    const char                              *slave_type      = NULL;
+    gs_free char                            *word_list       = NULL;
     NMMetaSettingType                        s;
 
     connection_type = nm_connection_get_connection_type(connection);
@@ -4831,17 +4834,17 @@ run_rl_generator(rl_compentry_func_t *generator_func, const char *prefix)
 }
 
 static gboolean
-complete_option(NmCli *                   nmc,
+complete_option(NmCli                    *nmc,
                 const NMMetaAbstractInfo *abstract_info,
-                const char *              prefix,
-                NMConnection *            context_connection)
+                const char               *prefix,
+                NMConnection             *context_connection)
 {
-    const OptionInfo *           candidate;
-    const char *const *          values;
-    gs_strfreev char **          values_to_free    = NULL;
+    const OptionInfo            *candidate;
+    const char *const           *values;
+    gs_strfreev char           **values_to_free    = NULL;
     gboolean                     complete_filename = FALSE;
     const NMMetaOperationContext ctx               = {
-        .connection = context_connection,
+                      .connection = context_connection,
     };
 
     values = nm_meta_abstract_info_complete(abstract_info,
@@ -4873,7 +4876,7 @@ complete_option(NmCli *                   nmc,
 static void
 complete_existing_setting(NmCli *nmc, NMConnection *connection, const char *prefix)
 {
-    gs_free NMSetting **           settings = NULL;
+    gs_free NMSetting            **settings = NULL;
     const NMMetaSettingInfoEditor *editor;
     guint                          i;
 
@@ -4892,10 +4895,10 @@ complete_existing_setting(NmCli *nmc, NMConnection *connection, const char *pref
 }
 
 static void
-complete_property(NmCli *       nmc,
-                  const char *  setting_name,
-                  const char *  property,
-                  const char *  prefix,
+complete_property(NmCli        *nmc,
+                  const char   *setting_name,
+                  const char   *property,
+                  const char   *prefix,
                   NMConnection *connection)
 {
     const NMMetaPropertyInfo *property_info;
@@ -4928,11 +4931,11 @@ connection_remove_setting(NMConnection *connection, NMSetting *setting, GError *
 }
 
 static gboolean
-get_value(const char **       value,
-          int *               argc,
+get_value(const char        **value,
+          int                *argc,
           const char *const **argv,
-          const char *        option,
-          GError **           error)
+          const char         *option,
+          GError            **error)
 {
     if (!**argv) {
         g_set_error(error,
@@ -4955,12 +4958,12 @@ get_value(const char **       value,
 }
 
 gboolean
-nmc_process_connection_properties(NmCli *             nmc,
-                                  NMConnection *      connection,
-                                  int *               argc,
+nmc_process_connection_properties(NmCli              *nmc,
+                                  NMConnection       *connection,
+                                  int                *argc,
                                   const char *const **argv,
                                   gboolean            allow_setting_removal,
-                                  GError **           error)
+                                  GError            **error)
 {
     /* First check if we have a slave-type, as this would mean we will not
      * have ip properties but possibly others, slave-type specific.
@@ -4970,13 +4973,13 @@ nmc_process_connection_properties(NmCli *             nmc,
         const NMMetaSettingValidPartItem *const *type_settings;
         const NMMetaSettingValidPartItem *const *slv_settings;
         NMMetaAccessorModifier                   modifier;
-        const char *                             option_orig;
-        const char *                             option;
-        const char *                             value = NULL;
-        const char *                             tmp;
-        const NMMetaAbstractInfo *               chosen              = NULL;
-        const char *                             chosen_setting_name = NULL;
-        const char *                             chosen_option       = NULL;
+        const char                              *option_orig;
+        const char                              *option;
+        const char                              *value = NULL;
+        const char                              *tmp;
+        const NMMetaAbstractInfo                *chosen              = NULL;
+        const char                              *chosen_setting_name = NULL;
+        const char                              *chosen_option       = NULL;
         NMMetaSettingType                        s;
 
         if (!con_settings(connection, &type_settings, &slv_settings, error))
@@ -5016,7 +5019,7 @@ nmc_process_connection_properties(NmCli *             nmc,
 
         if (allow_setting_removal && modifier == NM_META_ACCESSOR_MODIFIER_SET
             && nm_streq(option, "remove")) {
-            NMSetting * ss;
+            NMSetting  *ss;
             const char *setting_name;
 
             (*argc)--;
@@ -5060,9 +5063,9 @@ nmc_process_connection_properties(NmCli *             nmc,
 
         if ((tmp = strchr(option, '.'))) {
             gs_free char *option_sett = g_strndup(option, tmp - option);
-            const char *  option_prop = &tmp[1];
-            const char *  option_sett_expanded;
-            GError *      local = NULL;
+            const char   *option_prop = &tmp[1];
+            const char   *option_sett_expanded;
+            GError       *local = NULL;
 
             /* This seems like a <setting>.<property> (such as "connection.id" or "bond.mode"),
              * optionally prefixed with "+| or "-". */
@@ -5208,10 +5211,10 @@ static void
 add_connection_cb(GObject *client, GAsyncResult *result, gpointer user_data)
 {
     nm_auto_free_add_connection_info AddConnectionInfo *info = user_data;
-    NmCli *                                             nmc  = info->nmc;
-    NMRemoteConnection *                                connection;
-    GError *                                            error = NULL;
-    const GPtrArray *                                   connections;
+    NmCli                                              *nmc  = info->nmc;
+    NMRemoteConnection                                 *connection;
+    GError                                             *error = NULL;
+    const GPtrArray                                    *connections;
     guint                                               i, found;
 
     connection = nm_client_add_connection2_finish(NM_CLIENT(client), result, NULL, &error);
@@ -5266,8 +5269,8 @@ add_connection_cb(GObject *client, GAsyncResult *result, gpointer user_data)
 }
 
 static void
-add_connection(NMClient *          client,
-               NMConnection *      connection,
+add_connection(NMClient           *client,
+               NMConnection       *connection,
                gboolean            temporary,
                GAsyncReadyCallback callback,
                gpointer            user_data)
@@ -5311,10 +5314,10 @@ static char **
 nmcli_con_add_tab_completion(const char *text, int start, int end)
 {
     NMMetaSettingType         s;
-    char **                   match_array    = NULL;
-    rl_compentry_func_t *     generator_func = NULL;
-    gs_free char *            no             = g_strdup_printf("[%s]: ", _("no"));
-    gs_free char *            yes            = g_strdup_printf("[%s]: ", _("yes"));
+    char                    **match_array    = NULL;
+    rl_compentry_func_t      *generator_func = NULL;
+    gs_free char             *no             = g_strdup_printf("[%s]: ", _("no"));
+    gs_free char             *yes            = g_strdup_printf("[%s]: ", _("yes"));
     const NMMetaAbstractInfo *info;
 
     /* Disable readline's default filename completion */
@@ -5379,11 +5382,11 @@ next:
 static void
 ask_option(NmCli *nmc, NMConnection *connection, const NMMetaAbstractInfo *abstract_info)
 {
-    char *                 value;
-    GError *               error  = NULL;
-    gs_free char *         prompt = NULL;
+    char                  *value;
+    GError                *error  = NULL;
+    gs_free char          *prompt = NULL;
     gboolean               multi;
-    const char *           opt_prompt, *opt_def_hint;
+    const char            *opt_prompt, *opt_def_hint;
     NMMetaPropertyInfFlags inf_flags;
 
     _meta_abstract_get(abstract_info,
@@ -5420,8 +5423,8 @@ again:
 static NMMetaSettingType
 connection_get_base_meta_setting_type(NMConnection *connection)
 {
-    const char *                   connection_type;
-    NMSetting *                    base_setting;
+    const char                    *connection_type;
+    NMSetting                     *base_setting;
     const NMMetaSettingInfoEditor *editor;
 
     connection_type = nm_connection_get_connection_type(connection);
@@ -5438,7 +5441,7 @@ static void
 questionnaire_mandatory_ask_setting(NmCli *nmc, NMConnection *connection, NMMetaSettingType type)
 {
     const NMMetaSettingInfoEditor *editor;
-    const NMMetaPropertyInfo *     property_info;
+    const NMMetaPropertyInfo      *property_info;
     guint                          p;
 
     editor = &nm_meta_setting_infos_editor[type];
@@ -5516,7 +5519,7 @@ want_provide_opt_args(const NmcConfig *nmc_config, const char *type, guint num)
 static gboolean
 questionnaire_one_optional(NmCli *nmc, NMConnection *connection)
 {
-    NMMetaSettingType base;
+    NMMetaSettingType            base;
     gs_unref_ptrarray GPtrArray *infos = NULL;
     guint                        i, j;
     gboolean                     already_confirmed = FALSE;
@@ -5600,11 +5603,11 @@ static void
 do_connection_add(const NMCCommand *cmd, NmCli *nmc, int argc, const char *const *argv)
 {
     gs_unref_object NMConnection *connection = NULL;
-    NMSettingConnection *         s_con;
-    gs_free_error GError *error          = NULL;
-    gboolean              save_bool      = TRUE;
-    gboolean              seen_dash_dash = FALSE;
-    NMMetaSettingType     s;
+    NMSettingConnection          *s_con;
+    gs_free_error GError         *error          = NULL;
+    gboolean                      save_bool      = TRUE;
+    gboolean                      seen_dash_dash = FALSE;
+    NMMetaSettingType             s;
 
     next_arg(nmc, &argc, &argv, NULL);
 
@@ -5679,8 +5682,8 @@ read_properties:
         /* If only bother when there's a type, which is not guaranteed at this point.
          * Otherwise, the validation will fail anyway. */
         if (type) {
-            gs_free char *   try_name     = NULL;
-            gs_free char *   default_name = NULL;
+            gs_free char    *try_name     = NULL;
+            gs_free char    *default_name = NULL;
             const GPtrArray *connections;
 
             connections = nm_client_get_connections(nmc->client);
@@ -5769,10 +5772,10 @@ static void
 uuid_display_hook(char **array, int len, int max_len)
 {
     const GPtrArray *connections;
-    NMConnection *   con;
+    NMConnection    *con;
     int              i, max = 0;
-    char *           tmp;
-    const char *     id;
+    char            *tmp;
+    const char      *id;
     for (i = 1; i <= len; i++) {
         connections = nm_client_get_connections(nmc_tab_completion.nmc->client);
         con         = nmc_find_connection(connections, "uuid", array[i], NULL, FALSE);
@@ -5842,12 +5845,12 @@ static char *
 gen_cmd_print0(const char *text, int state)
 {
     static char **words = NULL;
-    char *        ret   = NULL;
+    char         *ret   = NULL;
 
     if (!state) {
-        GVariant *   settings;
+        GVariant    *settings;
         GVariantIter iter;
-        const char * setting_name;
+        const char  *setting_name;
         int          i = 0;
 
         settings = nm_connection_to_dbus(nmc_tab_completion.connection,
@@ -5888,9 +5891,9 @@ gen_cmd_save(const char *text, int state)
 static rl_compentry_func_t *
 gen_connection_types(const char *text)
 {
-    gs_free char **                values = NULL;
+    gs_free char                 **values = NULL;
     const NMMetaSettingInfoEditor *editor;
-    GPtrArray *                    array;
+    GPtrArray                     *array;
     int                            i;
 
     array = g_ptr_array_new();
@@ -5918,10 +5921,10 @@ static char *
 gen_setting_names(const char *text, int state)
 {
     static int                               list_idx, len, is_slv;
-    const char *                             s_name, *a_name;
+    const char                              *s_name, *a_name;
     const NMMetaSettingValidPartItem *const *valid_settings_arr;
-    NMSettingConnection *                    s_con;
-    const char *                             s_type = NULL;
+    NMSettingConnection                     *s_con;
+    const char                              *s_type = NULL;
 
     if (!state) {
         list_idx = 0;
@@ -5982,16 +5985,16 @@ gen_setting_names(const char *text, int state)
 static char *
 gen_property_names(const char *text, int state)
 {
-    NMSetting *                              setting     = NULL;
-    char **                                  valid_props = NULL;
-    char *                                   ret         = NULL;
-    const char *                             line        = rl_line_buffer;
-    const char *                             setting_name;
-    char **                                  strv = NULL;
+    NMSetting                               *setting     = NULL;
+    char                                   **valid_props = NULL;
+    char                                    *ret         = NULL;
+    const char                              *line        = rl_line_buffer;
+    const char                              *setting_name;
+    char                                   **strv = NULL;
     const NMMetaSettingValidPartItem *const *valid_settings_main;
     const NMMetaSettingValidPartItem *const *valid_settings_slave;
-    const char *                             p1;
-    const char *                             slv_type;
+    const char                              *p1;
+    const char                              *slv_type;
 
     /* Try to get the setting from 'line' - setting_name.property */
     p1 = strchr(line, '.');
@@ -6046,8 +6049,8 @@ gen_compat_devices(const char *text, int state)
 {
     guint            i, j = 0;
     const GPtrArray *devices;
-    const char **    compatible_devices;
-    char *           ret;
+    const char     **compatible_devices;
+    char            *ret;
 
     devices = nm_client_get_devices(nmc_tab_completion.nmc->client);
     if (devices->len == 0)
@@ -6055,9 +6058,9 @@ gen_compat_devices(const char *text, int state)
 
     compatible_devices = g_new(const char *, devices->len + 1);
     for (i = 0; i < devices->len; i++) {
-        NMDevice *  dev         = g_ptr_array_index(devices, i);
+        NMDevice   *dev         = g_ptr_array_index(devices, i);
         const char *ifname      = nm_device_get_iface(dev);
-        NMDevice *  device      = NULL;
+        NMDevice   *device      = NULL;
         const char *spec_object = NULL;
 
         if (find_device_for_connection(nmc_tab_completion.nmc,
@@ -6091,7 +6094,7 @@ _create_vpn_array(const GPtrArray *connections, gboolean uuid)
     array = g_new(const char *, connections->len + 1);
     for (c = 0; c < connections->len; c++) {
         NMConnection *connection = NM_CONNECTION(connections->pdata[c]);
-        const char *  type       = nm_connection_get_connection_type(connection);
+        const char   *type       = nm_connection_get_connection_type(connection);
 
         if (nm_streq0(type, NM_SETTING_VPN_SETTING_NAME))
             array[idx++] =
@@ -6105,8 +6108,8 @@ static char *
 gen_vpn_uuids(const char *text, int state)
 {
     const GPtrArray *connections;
-    const char **    uuids;
-    char *           ret;
+    const char     **uuids;
+    char            *ret;
 
     connections = nm_client_get_connections(nm_cli_global_readline->client);
     if (connections->len < 1)
@@ -6122,8 +6125,8 @@ static char *
 gen_vpn_ids(const char *text, int state)
 {
     const GPtrArray *connections;
-    const char **    ids;
-    char *           ret;
+    const char     **ids;
+    char            *ret;
 
     connections = nm_client_get_connections(nm_cli_global_readline->client);
     if (connections->len < 1)
@@ -6171,7 +6174,7 @@ get_gen_func_cmd_nmcli(const char *str)
 static gboolean
 should_complete_cmd(const char *line, int end, const char *cmd, int *cw_num, char **prev_word)
 {
-    char *      tmp;
+    char       *tmp;
     const char *word1, *word2, *word3;
     size_t      n1, n2, n3, n4, n5, n6;
     gboolean    word1_done, word2_done, word3_done;
@@ -6305,17 +6308,17 @@ static void
 get_setting_and_property(const char *prompt,
                          const char *line,
                          NMSetting **setting_out,
-                         char **     property_out)
+                         char      **property_out)
 {
     const NMMetaSettingValidPartItem *const *valid_settings_main;
     const NMMetaSettingValidPartItem *const *valid_settings_slave;
-    gs_unref_object NMSetting *setting  = NULL;
-    gs_free char *             property = NULL;
-    NMSettingConnection *      s_con;
-    gs_free char *             sett   = NULL;
-    gs_free char *             prop   = NULL;
-    const char *               s_type = NULL;
-    const char *               setting_name;
+    gs_unref_object NMSetting               *setting  = NULL;
+    gs_free char                            *property = NULL;
+    NMSettingConnection                     *s_con;
+    gs_free char                            *sett   = NULL;
+    gs_free char                            *prop   = NULL;
+    const char                              *s_type = NULL;
+    const char                              *setting_name;
 
     extract_setting_and_property(prompt, line, &sett, &prop);
 
@@ -6345,11 +6348,11 @@ get_setting_and_property(const char *prompt,
 }
 
 static gboolean
-_get_and_check_property(const char * prompt,
-                        const char * line,
+_get_and_check_property(const char  *prompt,
+                        const char  *line,
                         const char **array,
                         const char **array_multi,
-                        gboolean *   multi)
+                        gboolean    *multi)
 {
     gs_free char *prop  = NULL;
     gboolean      found = FALSE;
@@ -6398,8 +6401,8 @@ static const char *const *
 get_allowed_property_values(char ***out_to_free)
 {
     gs_unref_object NMSetting *setting  = NULL;
-    gs_free char *             property = NULL;
-    const char *const *        avals    = NULL;
+    gs_free char              *property = NULL;
+    const char *const         *avals    = NULL;
 
     get_setting_and_property(rl_prompt, rl_line_buffer, &setting, &property);
     if (setting && property)
@@ -6444,7 +6447,7 @@ static gboolean
 should_complete_boolean(const char *prompt, const char *line)
 {
     gs_unref_object NMSetting *setting  = NULL;
-    gs_free char *             property = NULL;
+    gs_free char              *property = NULL;
 
     get_setting_and_property(prompt, line, &setting, &property);
     return setting && property && _setting_property_is_boolean(setting, property);
@@ -6477,10 +6480,10 @@ static char **
 nmcli_editor_tab_completion(const char *text, int start, int end)
 {
     rl_compentry_func_t *generator_func = NULL;
-    const char *         line           = rl_line_buffer;
-    gs_free char *       prompt_tmp     = NULL;
-    gs_free char *       word           = NULL;
-    char **              match_array    = NULL;
+    const char          *line           = rl_line_buffer;
+    gs_free char        *prompt_tmp     = NULL;
+    gs_free char        *word           = NULL;
+    char               **match_array    = NULL;
     size_t               n1;
     int                  num;
 
@@ -6615,11 +6618,11 @@ static void
 load_history_cmds(const char *uuid)
 {
     GKeyFile *kf;
-    char *    filename;
-    char **   keys;
-    char *    line;
+    char     *filename;
+    char    **keys;
+    char     *line;
     size_t    i;
-    GError *  err = NULL;
+    GError   *err = NULL;
 
     filename = g_build_filename(g_get_home_dir(), NMCLI_EDITOR_HISTORY, NULL);
     kf       = g_key_file_new();
@@ -6645,13 +6648,13 @@ load_history_cmds(const char *uuid)
 static void
 save_history_cmds(const char *uuid)
 {
-    nm_auto_unref_keyfile GKeyFile *kf = NULL;
-    gs_free_error GError *error        = NULL;
-    gs_free char *        filename     = NULL;
-    gs_free char *        data         = NULL;
-    HIST_ENTRY **         hist;
-    gsize                 len;
-    gsize                 i;
+    nm_auto_unref_keyfile GKeyFile *kf       = NULL;
+    gs_free_error GError           *error    = NULL;
+    gs_free char                   *filename = NULL;
+    gs_free char                   *data     = NULL;
+    HIST_ENTRY                    **hist;
+    gsize                           len;
+    gsize                           i;
 
     hist = history_list();
     if (!hist)
@@ -6723,13 +6726,14 @@ typedef enum {
     NMC_EDITOR_MAIN_CMD_HELP,
     NMC_EDITOR_MAIN_CMD_NMCLI,
     NMC_EDITOR_MAIN_CMD_QUIT,
+    NMC_EDITOR_MAIN_CMD_ADD,
 } NmcEditorMainCmd;
 
 static void
 _split_cmd(const char *cmd, char **out_arg0, const char **out_argr)
 {
     gs_free char *arg0 = NULL;
-    const char *  argr = NULL;
+    const char   *argr = NULL;
     gsize         l;
 
     NM_SET_OUT(out_arg0, NULL);
@@ -6760,8 +6764,8 @@ static NmcEditorMainCmd
 parse_editor_main_cmd(const char *cmd, char **cmd_arg)
 {
     NmcEditorMainCmd editor_cmd = NMC_EDITOR_MAIN_CMD_UNKNOWN;
-    gs_free char *   cmd_arg0   = NULL;
-    const char *     cmd_argr;
+    gs_free char    *cmd_arg0   = NULL;
+    const char      *cmd_argr;
 
     _split_cmd(cmd, &cmd_arg0, &cmd_argr);
     if (!cmd_arg0)
@@ -6773,6 +6777,8 @@ parse_editor_main_cmd(const char *cmd, char **cmd_arg)
         editor_cmd = NMC_EDITOR_MAIN_CMD_REMOVE;
     else if (matches(cmd_arg0, "set"))
         editor_cmd = NMC_EDITOR_MAIN_CMD_SET;
+    else if (matches(cmd_arg0, "add"))
+        editor_cmd = NMC_EDITOR_MAIN_CMD_ADD;
     else if (matches(cmd_arg0, "describe"))
         editor_cmd = NMC_EDITOR_MAIN_CMD_DESCRIBE;
     else if (matches(cmd_arg0, "print"))
@@ -6854,6 +6860,11 @@ editor_main_help(const char *command)
                       "This command sets property value.\n\n"
                       "Example: nmcli> set con.id My connection\n"));
             break;
+        case NMC_EDITOR_MAIN_CMD_ADD:
+            g_print(_("add [<setting>.<prop> <value>]  :: add property value\n\n"
+                      "This command appends property value.\n\n"
+                      "Example: nmcli> add ipv4.addresses 192.168.1.1/24\n"));
+            break;
         case NMC_EDITOR_MAIN_CMD_DESCRIBE:
             g_print(_("describe [<setting>.<prop>]  :: describe property\n\n"
                       "Shows property description. You can consult nm-settings(5) "
@@ -6951,8 +6962,8 @@ static NmcEditorSubCmd
 parse_editor_sub_cmd(const char *cmd, char **cmd_arg)
 {
     NmcEditorSubCmd editor_cmd = NMC_EDITOR_SUB_CMD_UNKNOWN;
-    gs_free char *  cmd_arg0   = NULL;
-    const char *    cmd_argr;
+    gs_free char   *cmd_arg0   = NULL;
+    const char     *cmd_argr;
 
     _split_cmd(cmd, &cmd_arg0, &cmd_argr);
     if (!cmd_arg0)
@@ -7074,14 +7085,14 @@ editor_sub_usage(const char *command)
 /*****************************************************************************/
 
 typedef struct {
-    NMDevice *          device;
+    NMDevice           *device;
     NMActiveConnection *ac;
     guint               monitor_id;
-    NmCli *             nmc;
+    NmCli              *nmc;
 } MonitorACInfo;
 
 static gboolean       nmc_editor_cb_called;
-static GError *       nmc_editor_error;
+static GError        *nmc_editor_error;
 static MonitorACInfo *nmc_editor_monitor_ac;
 
 static void
@@ -7107,7 +7118,7 @@ static void
 add_connection_editor_cb(GObject *client, GAsyncResult *result, gpointer user_data)
 {
     gs_unref_object NMRemoteConnection *connection = NULL;
-    gs_free_error GError *error                    = NULL;
+    gs_free_error GError               *error      = NULL;
 
     connection = nm_client_add_connection2_finish(NM_CLIENT(client), result, NULL, &error);
     set_info_and_signal_editor_thread(error, NULL);
@@ -7126,9 +7137,9 @@ update_connection_editor_cb(GObject *connection, GAsyncResult *result, gpointer
 static gboolean
 progress_activation_editor_cb(gpointer user_data)
 {
-    MonitorACInfo *         info   = (MonitorACInfo *) user_data;
-    NMDevice *              device = info->device;
-    NMActiveConnection *    ac     = info->ac;
+    MonitorACInfo          *info   = (MonitorACInfo *) user_data;
+    NMDevice               *device = info->device;
+    NMActiveConnection     *ac     = info->ac;
     NMActiveConnectionState ac_state;
     NMDeviceState           dev_state;
 
@@ -7174,11 +7185,11 @@ static void
 activate_connection_editor_cb(GObject *client, GAsyncResult *result, gpointer user_data)
 {
     ActivateConnectionInfo *info   = (ActivateConnectionInfo *) user_data;
-    NMDevice *              device = info->device;
-    const GPtrArray *       ac_devs;
-    MonitorACInfo *         monitor_ac_info = NULL;
-    NMActiveConnection *    active;
-    GError *                error = NULL;
+    NMDevice               *device = info->device;
+    const GPtrArray        *ac_devs;
+    MonitorACInfo          *monitor_ac_info = NULL;
+    NMActiveConnection     *active;
+    GError                 *error = NULL;
 
     active = nm_client_activate_connection_finish(NM_CLIENT(client), result, &error);
 
@@ -7237,7 +7248,7 @@ static void
 editor_show_status_line(NMConnection *connection, gboolean dirty, gboolean temp)
 {
     NMSettingConnection *s_con;
-    const char *         con_type, *con_id, *con_uuid;
+    const char          *con_type, *con_id, *con_uuid;
 
     s_con = nm_connection_get_setting_connection(connection);
     g_assert(s_con);
@@ -7296,17 +7307,17 @@ confirm_quit(const NmcConfig *nmc_config)
  * Return: TRUE - continue;  FALSE - should quit
  */
 static gboolean
-property_edit_submenu(NmCli *              nmc,
-                      NMConnection *       connection,
+property_edit_submenu(NmCli               *nmc,
+                      NMConnection        *connection,
                       NMRemoteConnection **rem_con,
-                      GWeakRef *           rem_con_weak,
-                      NMSetting *          curr_setting,
-                      const char *         prop_name)
+                      GWeakRef            *rem_con_weak,
+                      NMSetting           *curr_setting,
+                      const char          *prop_name)
 {
     NmcEditorSubCmd cmdsub;
     gboolean        set_result;
-    GError *        tmp_err = NULL;
-    gs_free char *  prompt  = NULL;
+    GError         *tmp_err = NULL;
+    gs_free char   *prompt  = NULL;
     gboolean        temp_changes;
 
     /* Set global variable for use in TAB completion */
@@ -7467,8 +7478,8 @@ static void
 split_editor_main_cmd_args(const char *str, char **setting, char **property, char **value)
 {
     gs_free char *cmd_arg0 = NULL;
-    const char *  cmd_argr;
-    const char *  s;
+    const char   *cmd_argr;
+    const char   *s;
 
     NM_SET_OUT(setting, NULL);
     NM_SET_OUT(property, NULL);
@@ -7489,12 +7500,12 @@ split_editor_main_cmd_args(const char *str, char **setting, char **property, cha
 }
 
 static NMSetting *
-create_setting_by_name(const char *                             name,
+create_setting_by_name(const char                              *name,
                        const NMMetaSettingValidPartItem *const *valid_settings_main,
                        const NMMetaSettingValidPartItem *const *valid_settings_slave)
 {
     const char *setting_name;
-    NMSetting * setting = NULL;
+    NMSetting  *setting = NULL;
 
     /* Get a valid setting name */
     setting_name = check_valid_name(name, valid_settings_main, valid_settings_slave, NULL);
@@ -7508,15 +7519,15 @@ create_setting_by_name(const char *                             name,
 }
 
 static const char *
-ask_check_setting(const NmcConfig *                        nmc_config,
-                  const char *                             arg,
+ask_check_setting(const NmcConfig                         *nmc_config,
+                  const char                              *arg,
                   const NMMetaSettingValidPartItem *const *valid_settings_main,
                   const NMMetaSettingValidPartItem *const *valid_settings_slave,
-                  const char *                             valid_settings_str)
+                  const char                              *valid_settings_str)
 {
     gs_free char *setting_name_user = NULL;
-    const char *  setting_name;
-    GError *      err = NULL;
+    const char   *setting_name;
+    GError       *err = NULL;
 
     if (!arg) {
         g_print(_("Available settings: %s\n"), valid_settings_str);
@@ -7538,13 +7549,13 @@ ask_check_setting(const NmcConfig *                        nmc_config,
 
 static const char *
 ask_check_property(const NmcConfig *nmc_config,
-                   const char *     arg,
-                   const char **    valid_props,
-                   const char *     valid_props_str)
+                   const char      *arg,
+                   const char     **valid_props,
+                   const char      *valid_props_str)
 {
     gs_free_error GError *tmp_err        = NULL;
-    gs_free char *        prop_name_user = NULL;
-    const char *          prop_name;
+    gs_free char         *prop_name_user = NULL;
+    const char           *prop_name;
 
     if (!arg) {
         g_print(_("Available properties: %s\n"), valid_props_str);
@@ -7609,16 +7620,16 @@ confirm_connection_saving(const NmcConfig *nmc_config, NMConnection *local, NMCo
 
 typedef struct {
     guint      level;
-    char *     main_prompt;
+    char      *main_prompt;
     NMSetting *curr_setting;
-    char **    valid_props;
-    char *     valid_props_str;
+    char     **valid_props;
+    char      *valid_props_str;
 } NmcEditorMenuContext;
 
 static void
-menu_switch_to_level0(const NmcConfig *     nmc_config,
+menu_switch_to_level0(const NmcConfig      *nmc_config,
                       NmcEditorMenuContext *menu_ctx,
-                      const char *          prompt)
+                      const char           *prompt)
 {
     menu_ctx->level = 0;
     g_free(menu_ctx->main_prompt);
@@ -7631,10 +7642,10 @@ menu_switch_to_level0(const NmcConfig *     nmc_config,
 }
 
 static void
-menu_switch_to_level1(const NmcConfig *     nmc_config,
+menu_switch_to_level1(const NmcConfig      *nmc_config,
                       NmcEditorMenuContext *menu_ctx,
-                      NMSetting *           setting,
-                      const char *          setting_name)
+                      NMSetting            *setting,
+                      const char           *setting_name)
 {
     menu_ctx->level = 1;
     g_free(menu_ctx->main_prompt);
@@ -7660,19 +7671,19 @@ editor_save_timeout(gpointer user_data)
 static gboolean
 editor_menu_main(NmCli *nmc, NMConnection *connection, const char *connection_type)
 {
-    gs_unref_object NMRemoteConnection *     rem_con = NULL;
-    NMSettingConnection *                    s_con;
-    NMRemoteConnection *                     con_tmp;
+    gs_unref_object NMRemoteConnection      *rem_con = NULL;
+    NMSettingConnection                     *s_con;
+    NMRemoteConnection                      *con_tmp;
     GWeakRef                                 weak = {{NULL}};
     gboolean                                 removed;
     NmcEditorMainCmd                         cmd;
     gboolean                                 cmd_loop = TRUE;
     const NMMetaSettingValidPartItem *const *valid_settings_main;
     const NMMetaSettingValidPartItem *const *valid_settings_slave;
-    gs_free char *                           valid_settings_str = NULL;
-    const char *                             s_type             = NULL;
+    gs_free char                            *valid_settings_str = NULL;
+    const char                              *s_type             = NULL;
     gboolean                                 temp_changes;
-    GError *                                 err1     = NULL;
+    GError                                  *err1     = NULL;
     NmcEditorMenuContext                     menu_ctx = {0};
 
     s_con = nm_connection_get_setting_connection(connection);
@@ -7724,15 +7735,16 @@ editor_menu_main(NmCli *nmc, NMConnection *connection, const char *connection_ty
 
         split_editor_main_cmd_args(cmd_arg, &cmd_arg_s, &cmd_arg_p, &cmd_arg_v);
         switch (cmd) {
+        case NMC_EDITOR_MAIN_CMD_ADD:
         case NMC_EDITOR_MAIN_CMD_SET:
             /* Set property value */
             if (!cmd_arg) {
                 if (menu_ctx.level == 1) {
                     gs_strfreev char **avals_to_free = NULL;
-                    gs_free char *     prop_val_user = NULL;
-                    const char *       prop_name;
+                    gs_free char      *prop_val_user = NULL;
+                    const char        *prop_name;
                     const char *const *avals;
-                    GError *           tmp_err = NULL;
+                    GError            *tmp_err = NULL;
 
                     prop_name = ask_check_property(&nmc->nmc_config,
                                                    cmd_arg,
@@ -7769,10 +7781,10 @@ editor_menu_main(NmCli *nmc, NMConnection *connection, const char *connection_ty
                     g_print(_("use 'goto <setting>' first, or 'set <setting>.<property>'\n"));
                 }
             } else {
-                gs_free char *  prop_name             = NULL;
+                gs_free char              *prop_name  = NULL;
                 gs_unref_object NMSetting *ss_created = NULL;
-                NMSetting *                ss         = NULL;
-                GError *                   tmp_err    = NULL;
+                NMSetting                 *ss         = NULL;
+                GError                    *tmp_err    = NULL;
 
                 if (cmd_arg_s) {
                     /* setting provided as "setting.property" */
@@ -7847,7 +7859,7 @@ editor_menu_main(NmCli *nmc, NMConnection *connection, const char *connection_ty
             if (menu_ctx.level == 0 || cmd_arg_s) {
                 /* in top level - no setting selected yet */
                 const char *setting_name;
-                NMSetting * setting;
+                NMSetting  *setting;
                 const char *user_arg = cmd_arg_s ?: cmd_arg_p;
 
                 setting_name = ask_check_setting(&nmc->nmc_config,
@@ -7920,7 +7932,7 @@ editor_menu_main(NmCli *nmc, NMConnection *connection, const char *connection_ty
             /* Remove setting from connection, or delete value of a property */
             if (!cmd_arg) {
                 if (menu_ctx.level == 1) {
-                    GError *    tmp_err = NULL;
+                    GError     *tmp_err = NULL;
                     const char *prop_name;
 
                     prop_name = ask_check_property(&nmc->nmc_config,
@@ -7946,7 +7958,7 @@ editor_menu_main(NmCli *nmc, NMConnection *connection, const char *connection_ty
             } else {
                 NMSetting *ss = NULL;
                 gboolean   descr_all;
-                char *     user_s;
+                char      *user_s;
 
                 /* cmd_arg_s != NULL means argument is "setting.property" */
                 descr_all = !cmd_arg_s && !menu_ctx.curr_setting;
@@ -7985,16 +7997,17 @@ editor_menu_main(NmCli *nmc, NMConnection *connection, const char *connection_ty
                         nmc_tab_completion.setting = NULL; /* for TAB completion */
                     }
                 } else {
-                    gs_free char *prop_name       = NULL;
-                    gs_free_error GError *tmp_err = NULL;
+                    gs_free char         *prop_name = NULL;
+                    gs_free_error GError *tmp_err   = NULL;
 
                     prop_name = is_property_valid(ss, cmd_arg_p, &tmp_err);
                     if (prop_name) {
                         if (!nmc_setting_set_property(nmc->client,
                                                       ss,
                                                       prop_name,
-                                                      NM_META_ACCESSOR_MODIFIER_SET,
-                                                      NULL,
+                                                      cmd_arg_v ? NM_META_ACCESSOR_MODIFIER_DEL
+                                                                : NM_META_ACCESSOR_MODIFIER_SET,
+                                                      cmd_arg_v ? cmd_arg_v : NULL,
                                                       &tmp_err)) {
                             g_print(_("Error: failed to remove value of '%s': %s\n"),
                                     prop_name,
@@ -8051,9 +8064,9 @@ editor_menu_main(NmCli *nmc, NMConnection *connection, const char *connection_ty
                 }
             } else {
                 gs_unref_object NMSetting *ss_free = NULL;
-                NMSetting *                ss      = NULL;
+                NMSetting                 *ss      = NULL;
                 gboolean                   descr_all;
-                char *                     user_s;
+                char                      *user_s;
 
                 /* cmd_arg_s != NULL means argument is "setting.property" */
                 descr_all = !cmd_arg_s && !menu_ctx.curr_setting;
@@ -8086,7 +8099,7 @@ editor_menu_main(NmCli *nmc, NMConnection *connection, const char *connection_ty
                     print_setting_description(ss);
                 } else {
                     gs_free_error GError *tmp_err   = NULL;
-                    gs_free char *        prop_name = NULL;
+                    gs_free char         *prop_name = NULL;
 
                     prop_name = is_property_valid(ss, cmd_arg_p, &tmp_err);
                     if (prop_name) {
@@ -8120,7 +8133,7 @@ editor_menu_main(NmCli *nmc, NMConnection *connection, const char *connection_ty
                 else {
                     NMSetting *ss = NULL;
                     gboolean   whole_setting;
-                    char *     user_s;
+                    char      *user_s;
 
                     /* cmd_arg_s != NULL means argument is "setting.property" */
                     whole_setting = !cmd_arg_s && !menu_ctx.curr_setting;
@@ -8150,7 +8163,7 @@ editor_menu_main(NmCli *nmc, NMConnection *connection, const char *connection_ty
                         editor_show_setting(ss, nmc);
                     } else {
                         gs_free char *prop_name = NULL;
-                        GError *      err       = NULL;
+                        GError       *err       = NULL;
 
                         prop_name = is_property_valid(ss, cmd_arg_p, &err);
                         if (prop_name) {
@@ -8220,8 +8233,8 @@ editor_menu_main(NmCli *nmc, NMConnection *connection, const char *connection_ty
         case NMC_EDITOR_MAIN_CMD_SAVE:
             /* Save the connection */
             if (nm_connection_verify(connection, &err1)) {
-                gboolean              temporary = FALSE;
-                gboolean              connection_changed;
+                gboolean                       temporary = FALSE;
+                gboolean                       connection_changed;
                 nm_auto_unref_gsource GSource *source     = NULL;
                 gboolean                       timeout    = FALSE;
                 gulong                         handler_id = 0;
@@ -8338,7 +8351,7 @@ editor_menu_main(NmCli *nmc, NMConnection *connection, const char *connection_ty
 
         case NMC_EDITOR_MAIN_CMD_ACTIVATE:
         {
-            GError *    tmp_err = NULL;
+            GError     *tmp_err = NULL;
             const char *ifname  = cmd_arg_p;
             const char *ap_nsp  = cmd_arg_v;
 
@@ -8421,7 +8434,7 @@ editor_menu_main(NmCli *nmc, NMConnection *connection, const char *connection_ty
 
         case NMC_EDITOR_MAIN_CMD_NMCLI:
             if (cmd_arg_p && matches(cmd_arg_p, "status-line")) {
-                GError * tmp_err = NULL;
+                GError  *tmp_err = NULL;
                 gboolean bb;
                 if (!nmc_string_to_bool(cmd_arg_v ? g_strstrip(cmd_arg_v) : "", &bb, &tmp_err)) {
                     g_print(_("Error: status-line: %s\n"), tmp_err->message);
@@ -8429,7 +8442,7 @@ editor_menu_main(NmCli *nmc, NMConnection *connection, const char *connection_ty
                 } else
                     nmc->editor_status_line = bb;
             } else if (cmd_arg_p && matches(cmd_arg_p, "save-confirmation")) {
-                GError * tmp_err = NULL;
+                GError  *tmp_err = NULL;
                 gboolean bb;
                 if (!nmc_string_to_bool(cmd_arg_v ? g_strstrip(cmd_arg_v) : "", &bb, &tmp_err)) {
                     g_print(_("Error: save-confirmation: %s\n"), tmp_err->message);
@@ -8437,7 +8450,7 @@ editor_menu_main(NmCli *nmc, NMConnection *connection, const char *connection_ty
                 } else
                     nmc->editor_save_confirmation = bb;
             } else if (cmd_arg_p && matches(cmd_arg_p, "show-secrets")) {
-                GError * tmp_err = NULL;
+                GError  *tmp_err = NULL;
                 gboolean bb;
                 if (!nmc_string_to_bool(cmd_arg_v ? g_strstrip(cmd_arg_v) : "", &bb, &tmp_err)) {
                     g_print(_("Error: show-secrets: %s\n"), tmp_err->message);
@@ -8508,9 +8521,9 @@ get_ethernet_device_name(NmCli *nmc)
 static void
 editor_init_new_connection(NmCli *nmc, NMConnection *connection, const char *slave_type)
 {
-    NMSetting *          setting, *base_setting;
+    NMSetting           *setting, *base_setting;
     NMSettingConnection *s_con;
-    const char *         con_type;
+    const char          *con_type;
 
     s_con = nm_connection_get_setting_connection(connection);
     g_assert(s_con);
@@ -8579,9 +8592,9 @@ editor_init_new_connection(NmCli *nmc, NMConnection *connection, const char *sla
 static void
 editor_init_existing_connection(NMConnection *connection)
 {
-    NMSettingIPConfig *  s_ip4, *s_ip6;
-    NMSettingProxy *     s_proxy;
-    NMSettingWireless *  s_wireless;
+    NMSettingIPConfig   *s_ip4, *s_ip6;
+    NMSettingProxy      *s_proxy;
+    NMSettingWireless   *s_wireless;
     NMSettingConnection *s_con;
 
     /* FIXME: this approach of connecting handlers to do something is fundamentally
@@ -8623,21 +8636,21 @@ nmc_complete_connection_type(const char *prefix)
 static void
 do_connection_edit(const NMCCommand *cmd, NmCli *nmc, int argc, const char *const *argv)
 {
-    const GPtrArray *connections;
+    const GPtrArray              *connections;
     gs_unref_object NMConnection *connection = NULL;
-    NMSettingConnection *         s_con;
-    const char *                  connection_type;
-    const char *                  type         = NULL;
-    const char *                  con_name     = NULL;
-    const char *                  con          = NULL;
-    const char *                  con_id       = NULL;
-    const char *                  con_uuid     = NULL;
-    const char *                  con_path     = NULL;
-    const char *                  con_filename = NULL;
-    const char *                  selector     = NULL;
-    gs_free_error GError *error                = NULL;
-    GError *              err1                 = NULL;
-    nmc_arg_t             exp_args[]           = {{"type", TRUE, &type, FALSE},
+    NMSettingConnection          *s_con;
+    const char                   *connection_type;
+    const char                   *type         = NULL;
+    const char                   *con_name     = NULL;
+    const char                   *con          = NULL;
+    const char                   *con_id       = NULL;
+    const char                   *con_uuid     = NULL;
+    const char                   *con_path     = NULL;
+    const char                   *con_filename = NULL;
+    const char                   *selector     = NULL;
+    gs_free_error GError         *error        = NULL;
+    GError                       *err1         = NULL;
+    nmc_arg_t                     exp_args[]   = {{"type", TRUE, &type, FALSE},
                             {"con-name", TRUE, &con_name, FALSE},
                             {"id", TRUE, &con_id, FALSE},
                             {"uuid", TRUE, &con_uuid, FALSE},
@@ -8731,7 +8744,7 @@ do_connection_edit(const NMCCommand *cmd, NmCli *nmc, int argc, const char *cons
 
         editor_init_existing_connection(connection);
     } else {
-        const char *  slave_type   = NULL;
+        const char   *slave_type   = NULL;
         gs_free char *uuid         = NULL;
         gs_free char *default_name = NULL;
         gs_free char *tmp_str      = NULL;
@@ -8825,7 +8838,7 @@ do_connection_edit(const NMCCommand *cmd, NmCli *nmc, int argc, const char *cons
 static void
 modify_connection_cb(GObject *connection, GAsyncResult *result, gpointer user_data)
 {
-    NmCli *       nmc           = user_data;
+    NmCli                *nmc   = user_data;
     gs_free_error GError *error = NULL;
 
     if (!nm_remote_connection_commit_changes_finish(NM_REMOTE_CONNECTION(connection),
@@ -8849,10 +8862,10 @@ modify_connection_cb(GObject *connection, GAsyncResult *result, gpointer user_da
 static void
 do_connection_modify(const NMCCommand *cmd, NmCli *nmc, int argc, const char *const *argv)
 {
-    NMConnection *      connection  = NULL;
-    NMRemoteConnection *rc          = NULL;
-    gs_free_error GError *error     = NULL;
-    gboolean              temporary = FALSE;
+    NMConnection         *connection = NULL;
+    NMRemoteConnection   *rc         = NULL;
+    gs_free_error GError *error      = NULL;
+    gboolean              temporary  = FALSE;
 
     if (next_arg(nmc, &argc, &argv, "--temporary", NULL) > 0) {
         temporary = TRUE;
@@ -8891,10 +8904,10 @@ do_connection_modify(const NMCCommand *cmd, NmCli *nmc, int argc, const char *co
 static void
 clone_connection_cb(GObject *client, GAsyncResult *result, gpointer user_data)
 {
-    nm_auto_free_add_connection_info AddConnectionInfo *info = user_data;
-    NmCli *                                             nmc  = info->nmc;
-    gs_unref_object NMRemoteConnection *connection           = NULL;
-    gs_free_error GError *error                              = NULL;
+    nm_auto_free_add_connection_info AddConnectionInfo *info       = user_data;
+    NmCli                                              *nmc        = info->nmc;
+    gs_unref_object NMRemoteConnection                 *connection = NULL;
+    gs_free_error GError                               *error      = NULL;
 
     connection = nm_client_add_connection2_finish(NM_CLIENT(client), result, NULL, &error);
     if (error) {
@@ -8917,17 +8930,17 @@ clone_connection_cb(GObject *client, GAsyncResult *result, gpointer user_data)
 static void
 do_connection_clone(const NMCCommand *cmd, NmCli *nmc, int argc, const char *const *argv)
 {
-    NMConnection *  connection                   = NULL;
+    NMConnection                 *connection     = NULL;
     gs_unref_object NMConnection *new_connection = NULL;
-    const char *                  new_name;
-    gs_free char *                new_name_free = NULL;
-    gs_free char *                uuid          = NULL;
+    const char                   *new_name;
+    gs_free char                 *new_name_free = NULL;
+    gs_free char                 *uuid          = NULL;
     gboolean                      temporary     = FALSE;
-    gs_strfreev char **           arg_arr       = NULL;
+    gs_strfreev char            **arg_arr       = NULL;
     int                           arg_num;
-    const char *const **          argv_ptr;
-    int *                         argc_ptr;
-    GError *                      error = NULL;
+    const char *const           **argv_ptr;
+    int                          *argc_ptr;
+    GError                       *error = NULL;
 
     if (next_arg(nmc, &argc, &argv, "--temporary", NULL) > 0) {
         temporary = TRUE;
@@ -8999,7 +9012,7 @@ static void
 delete_cb(GObject *con, GAsyncResult *result, gpointer user_data)
 {
     ConnectionCbInfo *info  = (ConnectionCbInfo *) user_data;
-    GError *          error = NULL;
+    GError           *error = NULL;
 
     if (!nm_remote_connection_delete_finish(NM_REMOTE_CONNECTION(con), result, &error)) {
         if (g_error_matches(error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
@@ -9018,15 +9031,15 @@ delete_cb(GObject *con, GAsyncResult *result, gpointer user_data)
 static void
 do_connection_delete(const NMCCommand *cmd, NmCli *nmc, int argc, const char *const *argv)
 {
-    NMConnection *       connection;
-    ConnectionCbInfo *   info    = NULL;
-    gs_strfreev char **  arg_arr = NULL;
-    const char *const *  arg_ptr;
-    guint                i;
-    int                  arg_num;
+    NMConnection                 *connection;
+    ConnectionCbInfo             *info    = NULL;
+    gs_strfreev char            **arg_arr = NULL;
+    const char *const            *arg_ptr;
+    guint                         i;
+    int                           arg_num;
     nm_auto_free_gstring GString *invalid_cons = NULL;
-    gs_unref_ptrarray GPtrArray *found_cons    = NULL;
-    GError *                     error         = NULL;
+    gs_unref_ptrarray GPtrArray  *found_cons   = NULL;
+    GError                       *error        = NULL;
 
     if (nmc->timeout == -1)
         nmc->timeout = 10;
@@ -9168,10 +9181,10 @@ connection_removed(NMClient *client, NMRemoteConnection *con, NmCli *nmc)
 static void
 do_connection_monitor(const NMCCommand *cmd, NmCli *nmc, int argc, const char *const *argv)
 {
-    GError *          error = NULL;
-    guint             i;
+    GError                      *error = NULL;
+    guint                        i;
     gs_unref_ptrarray GPtrArray *found_cons  = NULL;
-    const GPtrArray *            connections = NULL;
+    const GPtrArray             *connections = NULL;
 
     next_arg(nmc, &argc, &argv, NULL);
     if (argc == 0) {
@@ -9222,9 +9235,9 @@ do_connection_monitor(const NMCCommand *cmd, NmCli *nmc, int argc, const char *c
 static void
 connection_reload_cb(GObject *source, GAsyncResult *result, gpointer user_data)
 {
-    NmCli *       nmc              = user_data;
-    gs_free_error GError *error    = NULL;
-    gs_unref_variant GVariant *ret = NULL;
+    NmCli                     *nmc   = user_data;
+    gs_free_error GError      *error = NULL;
+    gs_unref_variant GVariant *ret   = NULL;
 
     ret = nm_dbus_call_finish(result, &error);
     if (error) {
@@ -9261,10 +9274,10 @@ do_connection_reload(const NMCCommand *cmd, NmCli *nmc, int argc, const char *co
 static void
 do_connection_load(const NMCCommand *cmd, NmCli *nmc, int argc, const char *const *argv)
 {
-    GError *           error       = NULL;
+    GError            *error       = NULL;
     gs_strfreev char **filenames   = NULL;
     gs_strfreev char **failures    = NULL;
-    gs_free char *     current_dir = NULL;
+    gs_free char      *current_dir = NULL;
     int                i;
 
     next_arg(nmc, &argc, &argv, NULL);
@@ -9318,13 +9331,13 @@ do_connection_load(const NMCCommand *cmd, NmCli *nmc, int argc, const char *cons
 static void
 do_connection_import(const NMCCommand *cmd, NmCli *nmc, int argc, const char *const *argv)
 {
-    gs_free_error GError *error = NULL;
-    const char *          type = NULL, *filename = NULL;
-    gs_free char *        type_ask           = NULL;
-    gs_free char *        filename_ask       = NULL;
-    gs_unref_object NMConnection *connection = NULL;
-    NMVpnEditorPlugin *           plugin;
-    gs_free char *                service_type = NULL;
+    gs_free_error GError         *error = NULL;
+    const char                   *type = NULL, *filename = NULL;
+    gs_free char                 *type_ask     = NULL;
+    gs_free char                 *filename_ask = NULL;
+    gs_unref_object NMConnection *connection   = NULL;
+    NMVpnEditorPlugin            *plugin;
+    gs_free char                 *service_type = NULL;
     gboolean                      temporary    = FALSE;
 
     /* Check --temporary */
@@ -9457,18 +9470,18 @@ do_connection_import(const NMCCommand *cmd, NmCli *nmc, int argc, const char *co
 static void
 do_connection_export(const NMCCommand *cmd, NmCli *nmc, int argc, const char *const *argv)
 {
-    NMConnection *     connection   = NULL;
-    const char *       out_name     = NULL;
-    gs_free char *     out_name_ask = NULL;
-    const char *       path         = NULL;
-    const char *       type         = NULL;
-    NMVpnEditorPlugin *plugin;
+    NMConnection         *connection   = NULL;
+    const char           *out_name     = NULL;
+    gs_free char         *out_name_ask = NULL;
+    const char           *path         = NULL;
+    const char           *type         = NULL;
+    NMVpnEditorPlugin    *plugin;
     gs_free_error GError *error     = NULL;
     char                  tmpfile[] = "/tmp/nmcli-export-temp-XXXXXX";
-    gs_strfreev char **   arg_arr   = NULL;
+    gs_strfreev char    **arg_arr   = NULL;
     int                   arg_num;
-    const char *const **  argv_ptr;
-    int *                 argc_ptr;
+    const char *const   **argv_ptr;
+    int                  *argc_ptr;
 
     next_arg(nmc, &argc, &argv, NULL);
     argv_ptr = &argv;
@@ -9577,8 +9590,8 @@ gen_func_connection_names(const char *text, int state)
 {
     guint            i;
     const GPtrArray *connections;
-    const char **    connection_names;
-    char *           ret;
+    const char     **connection_names;
+    char            *ret;
 
     connections = nm_client_get_connections(nm_cli_global_readline->client);
     if (connections->len == 0)
@@ -9600,8 +9613,8 @@ gen_func_active_connection_names(const char *text, int state)
 {
     guint            i;
     const GPtrArray *acs;
-    const char **    connections;
-    char *           ret;
+    const char     **connections;
+    char            *ret;
 
     if (!nm_cli_global_readline->client)
         return NULL;
@@ -9624,8 +9637,8 @@ gen_func_active_connection_names(const char *text, int state)
 static char **
 nmcli_con_tab_completion(const char *text, int start, int end)
 {
-    char **                   match_array    = NULL;
-    rl_compentry_func_t *     generator_func = NULL;
+    char                    **match_array    = NULL;
+    rl_compentry_func_t      *generator_func = NULL;
     const NMMetaAbstractInfo *info;
 
     /* Disable readline's default filename completion */
diff --git a/src/nmcli/connections.h b/src/nmcli/connections.h
index 74c1fe00..782c4eaf 100644
--- a/src/nmcli/connections.h
+++ b/src/nmcli/connections.h
@@ -10,12 +10,12 @@
 
 void monitor_connections(NmCli *nmc);
 
-gboolean nmc_process_connection_properties(NmCli *             nmc,
-                                           NMConnection *      connection,
-                                           int *               argc,
+gboolean nmc_process_connection_properties(NmCli              *nmc,
+                                           NMConnection       *connection,
+                                           int                *argc,
                                            const char *const **argv,
                                            gboolean            allow_remove_setting,
-                                           GError **           error);
+                                           GError            **error);
 
 NMMetaColor nmc_active_connection_state_to_color(NMActiveConnection *ac);
 
diff --git a/src/nmcli/devices.c b/src/nmcli/devices.c
index d2e472a0..e23ef681 100644
--- a/src/nmcli/devices.c
+++ b/src/nmcli/devices.c
@@ -93,9 +93,10 @@ wifi_signal_to_color(guint8 strength)
 
 /*****************************************************************************/
 
-static gconstpointer _metagen_device_status_get_fcn(NMC_META_GENERIC_INFO_GET_FCN_ARGS)
+static gconstpointer
+_metagen_device_status_get_fcn(NMC_META_GENERIC_INFO_GET_FCN_ARGS)
 {
-    NMDevice *          d = target;
+    NMDevice           *d = target;
     NMActiveConnection *ac;
 
     NMC_HANDLE_COLOR(nmc_device_state_to_color(d));
@@ -152,13 +153,14 @@ const NmcMetaGenericInfo
 
 /*****************************************************************************/
 
-static gconstpointer _metagen_device_detail_general_get_fcn(NMC_META_GENERIC_INFO_GET_FCN_ARGS)
+static gconstpointer
+_metagen_device_detail_general_get_fcn(NMC_META_GENERIC_INFO_GET_FCN_ARGS)
 {
-    NMDevice *          d = target;
+    NMDevice           *d = target;
     NMActiveConnection *ac;
     NMDeviceStateReason state_reason;
     NMConnectivityState connectivity;
-    const char *        s;
+    const char         *s;
 
     NMC_HANDLE_COLOR(NM_META_COLOR_NONE);
 
@@ -317,7 +319,7 @@ static NMRemoteConnection **
 _device_get_available_connections(NMDevice *d, guint *out_len)
 {
     NMRemoteConnection **avail_cons;
-    const GPtrArray *    avail_cons_arr;
+    const GPtrArray     *avail_cons_arr;
 
     avail_cons_arr = nm_device_get_available_connections(d);
     if (!avail_cons_arr || avail_cons_arr->len == 0) {
@@ -333,15 +335,16 @@ _device_get_available_connections(NMDevice *d, guint *out_len)
     return avail_cons;
 }
 
-static gconstpointer _metagen_device_detail_connections_get_fcn(NMC_META_GENERIC_INFO_GET_FCN_ARGS)
+static gconstpointer
+_metagen_device_detail_connections_get_fcn(NMC_META_GENERIC_INFO_GET_FCN_ARGS)
 {
-    NMDevice *d                             = target;
+    NMDevice                    *d          = target;
     gs_free NMRemoteConnection **avail_cons = NULL;
     guint                        avail_cons_len;
     guint                        i;
     guint                        j;
-    char **                      arr = NULL;
-    GString *                    str;
+    char                       **arr = NULL;
+    GString                     *str;
     gboolean                     had_prefix;
     gboolean                     has_prefix;
 
@@ -360,8 +363,8 @@ static gconstpointer _metagen_device_detail_connections_get_fcn(NMC_META_GENERIC
         j   = 0;
         for (i = 0; i < avail_cons_len; i++) {
             NMRemoteConnection *ac      = avail_cons[i];
-            const char *        ac_id   = nm_connection_get_id(NM_CONNECTION(ac));
-            const char *        ac_uuid = nm_connection_get_uuid(NM_CONNECTION(ac));
+            const char         *ac_id   = nm_connection_get_id(NM_CONNECTION(ac));
+            const char         *ac_uuid = nm_connection_get_uuid(NM_CONNECTION(ac));
 
             if (!ac_id || !ac_uuid) {
                 const char *ac_path = nm_connection_get_path(NM_CONNECTION(ac));
@@ -390,7 +393,7 @@ static gconstpointer _metagen_device_detail_connections_get_fcn(NMC_META_GENERIC
         had_prefix = FALSE;
         for (i = 0; i < avail_cons_len; i++) {
             NMRemoteConnection *ac = avail_cons[i];
-            const char *        p  = nm_connection_get_path(NM_CONNECTION(ac));
+            const char         *p  = nm_connection_get_path(NM_CONNECTION(ac));
 
             if (!p)
                 continue;
@@ -447,9 +450,10 @@ const NmcMetaGenericInfo *const
 
 /*****************************************************************************/
 
-static gconstpointer _metagen_device_detail_capabilities_get_fcn(NMC_META_GENERIC_INFO_GET_FCN_ARGS)
+static gconstpointer
+_metagen_device_detail_capabilities_get_fcn(NMC_META_GENERIC_INFO_GET_FCN_ARGS)
 {
-    NMDevice *           d = target;
+    NMDevice            *d = target;
     NMDeviceCapabilities caps;
     guint32              speed;
 
@@ -511,7 +515,7 @@ const NmcMetaGenericInfo
 /*****************************************************************************/
 
 static gconstpointer
-    _metagen_device_detail_wired_properties_get_fcn(NMC_META_GENERIC_INFO_GET_FCN_ARGS)
+_metagen_device_detail_wired_properties_get_fcn(NMC_META_GENERIC_INFO_GET_FCN_ARGS)
 {
     NMDevice *d = target;
 
@@ -552,9 +556,9 @@ const NmcMetaGenericInfo *const
 /*****************************************************************************/
 
 static gconstpointer
-    _metagen_device_detail_wifi_properties_get_fcn(NMC_META_GENERIC_INFO_GET_FCN_ARGS)
+_metagen_device_detail_wifi_properties_get_fcn(NMC_META_GENERIC_INFO_GET_FCN_ARGS)
 {
-    NMDevice *               d = target;
+    NMDevice                *d = target;
     NMDeviceWifiCapabilities wcaps;
 
     NMC_HANDLE_COLOR(NM_META_COLOR_NONE);
@@ -649,9 +653,9 @@ const NmcMetaGenericInfo *const
 /*****************************************************************************/
 
 static gconstpointer
-    _metagen_device_detail_interface_flags_get_fcn(NMC_META_GENERIC_INFO_GET_FCN_ARGS)
+_metagen_device_detail_interface_flags_get_fcn(NMC_META_GENERIC_INFO_GET_FCN_ARGS)
 {
-    NMDevice *             d = target;
+    NMDevice              *d = target;
     NMDeviceInterfaceFlags flags;
 
     NMC_HANDLE_COLOR(NM_META_COLOR_NONE);
@@ -1049,8 +1053,8 @@ quit(void)
 static int
 compare_devices(const void *a, const void *b)
 {
-    NMDevice *          da    = *(NMDevice **) a;
-    NMDevice *          db    = *(NMDevice **) b;
+    NMDevice           *da    = *(NMDevice **) a;
+    NMDevice           *db    = *(NMDevice **) b;
     NMActiveConnection *da_ac = nm_device_get_active_connection(da);
     NMActiveConnection *db_ac = nm_device_get_active_connection(db);
 
@@ -1067,7 +1071,7 @@ NMDevice **
 nmc_get_devices_sorted(NMClient *client)
 {
     const GPtrArray *devs;
-    NMDevice **      sorted;
+    NMDevice       **sorted;
 
     devs = nm_client_get_devices(client);
 
@@ -1111,9 +1115,9 @@ get_device_list(NmCli *nmc, int argc, const char *const *argv)
     int                arg_num = argc;
     gs_strfreev char **arg_arr = NULL;
     const char *const *arg_ptr = argv;
-    NMDevice **        devices;
-    GSList *           queue = NULL;
-    NMDevice *         device;
+    NMDevice         **devices;
+    GSList            *queue = NULL;
+    NMDevice          *device;
     int                i;
 
     if (argc == 0) {
@@ -1171,8 +1175,8 @@ static NMDevice *
 get_device(NmCli *nmc, int *argc, const char *const **argv, GError **error)
 {
     gs_free NMDevice **devices    = NULL;
-    gs_free char *     ifname_ask = NULL;
-    const char *       ifname     = NULL;
+    gs_free char      *ifname_ask = NULL;
+    const char        *ifname     = NULL;
     int                i;
 
     if (*argc == 0) {
@@ -1245,39 +1249,39 @@ sort_access_points(const GPtrArray *aps)
 }
 
 typedef struct {
-    NmCli *     nmc;
+    NmCli      *nmc;
     int         index;
     guint32     output_flags;
     const char *active_bssid;
     const char *device;
-    GPtrArray * output_data;
+    GPtrArray  *output_data;
 } APInfo;
 
 static void
 fill_output_access_point(gpointer data, gpointer user_data)
 {
-    NMAccessPoint *        ap   = NM_ACCESS_POINT(data);
-    APInfo *               info = (APInfo *) user_data;
-    NmcOutputField *       arr;
+    NMAccessPoint         *ap   = NM_ACCESS_POINT(data);
+    APInfo                *info = (APInfo *) user_data;
+    NmcOutputField        *arr;
     gboolean               active = FALSE;
     NM80211ApFlags         flags;
     NM80211ApSecurityFlags wpa_flags, rsn_flags;
     guint32                freq, bitrate;
     guint8                 strength;
-    GBytes *               ssid;
-    const char *           bssid;
+    GBytes                *ssid;
+    const char            *bssid;
     NM80211Mode            mode;
-    char *                 channel_str;
-    char *                 freq_str;
-    char *                 ssid_str     = NULL;
-    char *                 ssid_hex_str = NULL;
-    char *                 bitrate_str;
-    char *                 strength_str;
-    char *                 wpa_flags_str;
-    char *                 rsn_flags_str;
-    GString *              security_str;
-    char *                 ap_name;
-    const char *           sig_bars;
+    char                  *channel_str;
+    char                  *freq_str;
+    char                  *ssid_str     = NULL;
+    char                  *ssid_hex_str = NULL;
+    char                  *bitrate_str;
+    char                  *strength_str;
+    char                  *wpa_flags_str;
+    char                  *rsn_flags_str;
+    GString               *security_str;
+    char                  *ap_name;
+    const char            *sig_bars;
     NMMetaColor            color;
 
     if (info->active_bssid) {
@@ -1413,16 +1417,16 @@ construct_header_name(const char *base, const char *spec)
 }
 
 static gboolean
-print_bond_bridge_info(NMDevice *  device,
-                       NmCli *     nmc,
+print_bond_bridge_info(NMDevice   *device,
+                       NmCli      *nmc,
                        const char *group_prefix,
                        const char *one_field)
 {
-    const GPtrArray *                slaves = NULL;
-    GString *                        slaves_str;
+    const GPtrArray                 *slaves = NULL;
+    GString                         *slaves_str;
     int                              idx;
     const NMMetaAbstractInfo *const *tmpl;
-    NmcOutputField *                 arr;
+    NmcOutputField                  *arr;
     NMC_OUTPUT_DATA_DEFINE_SCOPED(out);
 
     if (NM_IS_DEVICE_BOND(device))
@@ -1434,7 +1438,7 @@ print_bond_bridge_info(NMDevice *  device,
 
     slaves_str = g_string_new(NULL);
     for (idx = 0; slaves && idx < slaves->len; idx++) {
-        NMDevice *  slave = g_ptr_array_index(slaves, idx);
+        NMDevice   *slave = g_ptr_array_index(slaves, idx);
         const char *iface = nm_device_get_iface(slave);
 
         if (iface) {
@@ -1483,11 +1487,11 @@ sanitize_team_config(const char *config)
 static gboolean
 print_team_info(NMDevice *device, NmCli *nmc, const char *group_prefix, const char *one_field)
 {
-    const GPtrArray *                slaves = NULL;
-    GString *                        slaves_str;
+    const GPtrArray                 *slaves = NULL;
+    GString                         *slaves_str;
     int                              idx;
     const NMMetaAbstractInfo *const *tmpl;
-    NmcOutputField *                 arr;
+    NmcOutputField                  *arr;
     NMC_OUTPUT_DATA_DEFINE_SCOPED(out);
 
     if (NM_IS_DEVICE_TEAM(device))
@@ -1497,7 +1501,7 @@ print_team_info(NMDevice *device, NmCli *nmc, const char *group_prefix, const ch
 
     slaves_str = g_string_new(NULL);
     for (idx = 0; slaves && idx < slaves->len; idx++) {
-        NMDevice *  slave = g_ptr_array_index(slaves, idx);
+        NMDevice   *slave = g_ptr_array_index(slaves, idx);
         const char *iface = nm_device_get_iface(slave);
 
         if (iface) {
@@ -1528,18 +1532,18 @@ print_team_info(NMDevice *device, NmCli *nmc, const char *group_prefix, const ch
 static gboolean
 show_device_info(NMDevice *device, NmCli *nmc)
 {
-    GError *                         error = NULL;
+    GError                          *error = NULL;
     NMDeviceState                    state = NM_DEVICE_STATE_UNKNOWN;
-    GArray *                         sections_array;
+    GArray                          *sections_array;
     int                              k;
-    const char *                     fields_str = NULL;
+    const char                      *fields_str = NULL;
     const NMMetaAbstractInfo *const *tmpl;
-    NmcOutputField *                 arr;
+    NmcOutputField                  *arr;
     gboolean                         was_output = FALSE;
-    NMIPConfig *                     cfg4, *cfg6;
-    NMDhcpConfig *                   dhcp4, *dhcp6;
-    const char *                     base_hdr          = _("Device details");
-    GPtrArray *                      fields_in_section = NULL;
+    NMIPConfig                      *cfg4, *cfg6;
+    NMDhcpConfig                    *dhcp4, *dhcp6;
+    const char                      *base_hdr          = _("Device details");
+    GPtrArray                       *fields_in_section = NULL;
 
     if (!nmc->required_fields || g_ascii_strcasecmp(nmc->required_fields, "common") == 0)
         fields_str = NMC_FIELDS_DEV_SHOW_SECTIONS_COMMON;
@@ -1562,9 +1566,9 @@ show_device_info(NMDevice *device, NmCli *nmc)
     }
 
     {
-        gs_unref_array GArray *out_indices = NULL;
-        gs_free char *         header_name = NULL;
-        gs_free NmcOutputField *row        = NULL;
+        gs_unref_array GArray  *out_indices = NULL;
+        gs_free char           *header_name = NULL;
+        gs_free NmcOutputField *row         = NULL;
         int                     i;
 
         /* Main header (pretty only) */
@@ -1676,7 +1680,7 @@ show_device_info(NMDevice *device, NmCli *nmc)
         /* Wireless specific information */
         if ((NM_IS_DEVICE_WIFI(device))) {
             NMAccessPoint *active_ap    = NULL;
-            const char *   active_bssid = NULL;
+            const char    *active_bssid = NULL;
 
             /* section AP */
             if (!g_ascii_strcasecmp(nmc_fields_dev_show_sections[section_idx]->name,
@@ -1701,12 +1705,12 @@ show_device_info(NMDevice *device, NmCli *nmc)
                 {
                     gs_unref_ptrarray GPtrArray *aps  = NULL;
                     APInfo                       info = {
-                        .nmc          = nmc,
-                        .index        = 1,
-                        .output_flags = NMC_OF_FLAG_SECTION_PREFIX,
-                        .active_bssid = active_bssid,
-                        .device       = nm_device_get_iface(device),
-                        .output_data  = out.output_data,
+                                              .nmc          = nmc,
+                                              .index        = 1,
+                                              .output_flags = NMC_OF_FLAG_SECTION_PREFIX,
+                                              .active_bssid = active_bssid,
+                                              .device       = nm_device_get_iface(device),
+                                              .output_data  = out.output_data,
                     };
 
                     aps = sort_access_points(
@@ -1908,9 +1912,9 @@ nmc_device_state_to_color(NMDevice *device)
 static void
 do_devices_status(const NMCCommand *cmd, NmCli *nmc, int argc, const char *const *argv)
 {
-    GError *error                 = NULL;
+    GError            *error      = NULL;
     gs_free NMDevice **devices    = NULL;
-    const char *       fields_str = NULL;
+    const char        *fields_str = NULL;
 
     next_arg(nmc, &argc, &argv, NULL);
 
@@ -2020,17 +2024,17 @@ progress_cb(gpointer user_data)
 }
 
 typedef struct {
-    NmCli *             nmc;
-    NMDevice *          device;
+    NmCli              *nmc;
+    NMDevice           *device;
     NMActiveConnection *active;
-    char *              specific_object;
+    char               *specific_object;
     bool                hotspot : 1;
     bool                create : 1;
 } AddAndActivateInfo;
 
 static AddAndActivateInfo *
-add_and_activate_info_new(NmCli *     nmc,
-                          NMDevice *  device,
+add_and_activate_info_new(NmCli      *nmc,
+                          NMDevice   *device,
                           gboolean    hotspot,
                           gboolean    create,
                           const char *specific_object)
@@ -2103,10 +2107,10 @@ connected_state_cb(AddAndActivateInfo *info)
 static void
 add_and_activate_cb(GObject *client, GAsyncResult *result, gpointer user_data)
 {
-    nm_auto_free_add_and_activate_info AddAndActivateInfo *info = user_data;
-    NmCli *                                                nmc  = info->nmc;
-    gs_unref_object NMActiveConnection *active                  = NULL;
-    gs_free_error GError *error                                 = NULL;
+    nm_auto_free_add_and_activate_info AddAndActivateInfo *info   = user_data;
+    NmCli                                                 *nmc    = info->nmc;
+    gs_unref_object NMActiveConnection                    *active = NULL;
+    gs_free_error GError                                  *error  = NULL;
 
     if (info->create)
         active = nm_client_add_and_activate_connection_finish(NM_CLIENT(client), result, &error);
@@ -2151,7 +2155,7 @@ add_and_activate_cb(GObject *client, GAsyncResult *result, gpointer user_data)
 static void
 create_connect_connection_for_device(AddAndActivateInfo *info)
 {
-    NMConnection *       connection;
+    NMConnection        *connection;
     NMSettingConnection *s_con;
 
     /* Create new connection and tie it to the device */
@@ -2172,10 +2176,10 @@ create_connect_connection_for_device(AddAndActivateInfo *info)
 static void
 connect_device_cb(GObject *client, GAsyncResult *result, gpointer user_data)
 {
-    nm_auto_free_add_and_activate_info AddAndActivateInfo *info = user_data;
-    NmCli *                                                nmc  = info->nmc;
-    gs_unref_object NMActiveConnection *active                  = NULL;
-    GError *                            error                   = NULL;
+    nm_auto_free_add_and_activate_info AddAndActivateInfo *info   = user_data;
+    NmCli                                                 *nmc    = info->nmc;
+    gs_unref_object NMActiveConnection                    *active = NULL;
+    GError                                                *error  = NULL;
 
     active = nm_client_activate_connection_finish(NM_CLIENT(client), result, &error);
 
@@ -2220,8 +2224,8 @@ connect_device_cb(GObject *client, GAsyncResult *result, gpointer user_data)
 static void
 do_device_connect(const NMCCommand *cmd, NmCli *nmc, int argc, const char *const *argv)
 {
-    NMDevice *          device = NULL;
-    AddAndActivateInfo *info;
+    NMDevice             *device = NULL;
+    AddAndActivateInfo   *info;
     gs_free_error GError *error = NULL;
 
     /* Set default timeout for connect operation. */
@@ -2277,8 +2281,8 @@ do_device_connect(const NMCCommand *cmd, NmCli *nmc, int argc, const char *const
 }
 
 typedef struct {
-    NmCli *       nmc;
-    GSList *      queue;
+    NmCli        *nmc;
+    GSList       *queue;
     guint         timeout_id;
     gboolean      cmd_disconnect;
     GCancellable *cancellable;
@@ -2367,10 +2371,10 @@ device_cb_info_finish(DeviceCbInfo *info, NMDevice *device)
 static void
 reapply_device_cb(GObject *object, GAsyncResult *result, gpointer user_data)
 {
-    NMDevice *    device = NM_DEVICE(object);
+    NMDevice     *device = NM_DEVICE(object);
     DeviceCbInfo *info   = (DeviceCbInfo *) user_data;
-    NmCli *       nmc    = info->nmc;
-    GError *      error  = NULL;
+    NmCli        *nmc    = info->nmc;
+    GError       *error  = NULL;
 
     if (!nm_device_reapply_finish(device, result, &error)) {
         g_string_printf(nmc->return_text,
@@ -2393,8 +2397,8 @@ reapply_device_cb(GObject *object, GAsyncResult *result, gpointer user_data)
 static void
 do_device_reapply(const NMCCommand *cmd, NmCli *nmc, int argc, const char *const *argv)
 {
-    NMDevice *    device;
-    DeviceCbInfo *info          = NULL;
+    NMDevice             *device;
+    DeviceCbInfo         *info  = NULL;
     gs_free_error GError *error = NULL;
 
     /* Set default timeout for reapply operation. */
@@ -2447,10 +2451,10 @@ NM_AUTO_DEFINE_FCN_VOID0(ModifyInfo *, _auto_free_modify_info, modify_info_free)
 static void
 modify_reapply_cb(GObject *object, GAsyncResult *result, gpointer user_data)
 {
-    NMDevice *                                  device = NM_DEVICE(object);
+    NMDevice                                   *device = NM_DEVICE(object);
     nm_auto(_auto_free_modify_info) ModifyInfo *info   = user_data;
-    NmCli *                                     nmc    = info->nmc;
-    GError *                                    error  = NULL;
+    NmCli                                      *nmc    = info->nmc;
+    GError                                     *error  = NULL;
 
     if (!nm_device_reapply_finish(device, result, &error)) {
         g_string_printf(nmc->return_text,
@@ -2473,14 +2477,14 @@ modify_reapply_cb(GObject *object, GAsyncResult *result, gpointer user_data)
 static void
 modify_get_applied_cb(GObject *object, GAsyncResult *result, gpointer user_data)
 {
-    NMDevice *                                  device = NM_DEVICE(object);
+    NMDevice                                   *device = NM_DEVICE(object);
     nm_auto(_auto_free_modify_info) ModifyInfo *info   = user_data;
-    NmCli *                                     nmc    = info->nmc;
-    gs_free_error GError *error                        = NULL;
-    NMConnection *        connection;
-    guint64               version_id;
-    int                   argc;
-    const char *const *   argv;
+    NmCli                                      *nmc    = info->nmc;
+    gs_free_error GError                       *error  = NULL;
+    NMConnection                               *connection;
+    guint64                                     version_id;
+    int                                         argc;
+    const char *const                          *argv;
 
     connection = nm_device_get_applied_connection_finish(device, result, &version_id, &error);
     if (!connection) {
@@ -2521,8 +2525,8 @@ modify_get_applied_cb(GObject *object, GAsyncResult *result, gpointer user_data)
 static void
 do_device_modify(const NMCCommand *cmd, NmCli *nmc, int argc, const char *const *argv)
 {
-    NMDevice *    device = NULL;
-    ModifyInfo *  info;
+    NMDevice             *device = NULL;
+    ModifyInfo           *info;
     gs_free_error GError *error = NULL;
 
     next_arg(nmc, &argc, &argv, NULL);
@@ -2552,11 +2556,11 @@ do_device_modify(const NMCCommand *cmd, NmCli *nmc, int argc, const char *const
 static void
 disconnect_device_cb(GObject *object, GAsyncResult *result, gpointer user_data)
 {
-    NMDevice *    device = NM_DEVICE(object);
+    NMDevice     *device = NM_DEVICE(object);
     DeviceCbInfo *info   = (DeviceCbInfo *) user_data;
-    NmCli *       nmc;
+    NmCli        *nmc;
     NMDeviceState state;
-    GError *      error = NULL;
+    GError       *error = NULL;
 
     if (!nm_device_disconnect_finish(device, result, &error)) {
         if (g_error_matches(error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
@@ -2588,9 +2592,9 @@ disconnect_device_cb(GObject *object, GAsyncResult *result, gpointer user_data)
 static void
 do_devices_disconnect(const NMCCommand *cmd, NmCli *nmc, int argc, const char *const *argv)
 {
-    NMDevice *    device;
+    NMDevice     *device;
     DeviceCbInfo *info = NULL;
-    GSList *      queue, *iter;
+    GSList       *queue, *iter;
 
     /* Set default timeout for disconnect operation. */
     if (nmc->timeout == -1)
@@ -2633,10 +2637,10 @@ out:
 static void
 delete_device_cb(GObject *object, GAsyncResult *result, gpointer user_data)
 {
-    NMDevice *    device = NM_DEVICE(object);
+    NMDevice     *device = NM_DEVICE(object);
     DeviceCbInfo *info   = (DeviceCbInfo *) user_data;
-    NmCli *       nmc    = info->nmc;
-    GError *      error  = NULL;
+    NmCli        *nmc    = info->nmc;
+    GError       *error  = NULL;
 
     if (!nm_device_delete_finish(device, result, &error)) {
         g_string_printf(nmc->return_text, _("Error: not all devices deleted."));
@@ -2656,9 +2660,9 @@ delete_device_cb(GObject *object, GAsyncResult *result, gpointer user_data)
 static void
 do_devices_delete(const NMCCommand *cmd, NmCli *nmc, int argc, const char *const *argv)
 {
-    NMDevice *    device;
+    NMDevice     *device;
     DeviceCbInfo *info = NULL;
-    GSList *      queue, *iter;
+    GSList       *queue, *iter;
 
     /* Set default timeout for delete operation. */
     if (nmc->timeout == -1)
@@ -2814,7 +2818,7 @@ static void
 device_ac(NMDevice *device, GParamSpec *pspec, NmCli *nmc)
 {
     NMActiveConnection *ac = nm_device_get_active_connection(device);
-    const char *        id = ac ? nm_active_connection_get_id(ac) : NULL;
+    const char         *id = ac ? nm_active_connection_get_id(ac) : NULL;
 
     if (!id)
         return;
@@ -2928,7 +2932,7 @@ static NMAccessPoint *
 find_ap_on_device(NMDevice *device, const char *bssid, const char *ssid, gboolean complete)
 {
     const GPtrArray *aps;
-    NMAccessPoint *  ap = NULL;
+    NMAccessPoint   *ap = NULL;
     int              i;
 
     g_return_val_if_fail(NM_IS_DEVICE_WIFI(device), NULL);
@@ -2954,7 +2958,7 @@ find_ap_on_device(NMDevice *device, const char *bssid, const char *ssid, gboolea
         if (ssid) {
             /* Parameter is SSID */
             GBytes *candidate_ssid;
-            char *  ssid_tmp;
+            char   *ssid_tmp;
 
             candidate_ssid = nm_access_point_get_ssid(candidate_ap);
             if (!candidate_ssid)
@@ -2987,8 +2991,8 @@ find_ap_on_device(NMDevice *device, const char *bssid, const char *ssid, gboolea
 static void
 show_access_point_info(NMDeviceWifi *wifi, NmCli *nmc, NmcOutputData *out)
 {
-    NMAccessPoint * active_ap    = NULL;
-    const char *    active_bssid = NULL;
+    NMAccessPoint  *active_ap    = NULL;
+    const char     *active_bssid = NULL;
     NmcOutputField *arr;
 
     if (nm_device_get_state(NM_DEVICE(wifi)) == NM_DEVICE_STATE_ACTIVATED) {
@@ -3003,12 +3007,12 @@ show_access_point_info(NMDeviceWifi *wifi, NmCli *nmc, NmcOutputData *out)
     {
         gs_unref_ptrarray GPtrArray *aps  = NULL;
         APInfo                       info = {
-            .nmc          = nmc,
-            .index        = 1,
-            .output_flags = 0,
-            .active_bssid = active_bssid,
-            .device       = nm_device_get_iface(NM_DEVICE(wifi)),
-            .output_data  = out->output_data,
+                                  .nmc          = nmc,
+                                  .index        = 1,
+                                  .output_flags = 0,
+                                  .active_bssid = active_bssid,
+                                  .device       = nm_device_get_iface(NM_DEVICE(wifi)),
+                                  .output_data  = out->output_data,
         };
 
         aps = sort_access_points(nm_device_wifi_get_access_points(wifi));
@@ -3019,21 +3023,21 @@ show_access_point_info(NMDeviceWifi *wifi, NmCli *nmc, NmcOutputData *out)
 }
 
 static void
-wifi_print_aps(NMDeviceWifi *                   wifi,
-               NmCli *                          nmc,
-               GArray *                         _out_indices,
+wifi_print_aps(NMDeviceWifi                    *wifi,
+               NmCli                           *nmc,
+               GArray                          *_out_indices,
                const NMMetaAbstractInfo *const *tmpl,
-               const char *                     bssid_user,
-               gboolean *                       bssid_found)
+               const char                      *bssid_user,
+               gboolean                        *bssid_found)
 {
-    NMAccessPoint *  ap = NULL;
+    NMAccessPoint   *ap = NULL;
     const GPtrArray *aps;
-    APInfo *         info;
+    APInfo          *info;
     guint            i;
-    NmcOutputField * arr;
-    const char *     base_hdr = _("Wi-Fi scan list");
+    NmcOutputField  *arr;
+    const char      *base_hdr = _("Wi-Fi scan list");
     NMC_OUTPUT_DATA_DEFINE_SCOPED(out);
-    gs_free char *  header_name = NULL;
+    gs_free char   *header_name = NULL;
     static gboolean empty_line  = FALSE;
 
     if (empty_line)
@@ -3097,17 +3101,17 @@ _device_wifi_get_last_scan(NMDeviceWifi *wifi)
 }
 
 typedef struct {
-    NmCli *                          nmc;
-    NMDevice **                      devices;
+    NmCli                           *nmc;
+    NMDevice                       **devices;
     const NMMetaAbstractInfo *const *tmpl;
-    char *                           bssid_user;
-    GArray *                         out_indices;
+    char                            *bssid_user;
+    GArray                          *out_indices;
     gint64                           rescan_cutoff_msec;
     guint                            pending;
 } ScanInfo;
 
 typedef struct {
-    ScanInfo *    scan_info;
+    ScanInfo     *scan_info;
     NMDeviceWifi *wifi;
     gulong        last_scan_id;
     guint         timeout_id;
@@ -3118,7 +3122,7 @@ static void
 wifi_list_finish(WifiListData *wifi_list_data, gboolean force_finished)
 {
     ScanInfo *scan_info   = wifi_list_data->scan_info;
-    NmCli *   nmc         = scan_info->nmc;
+    NmCli    *nmc         = scan_info->nmc;
     gboolean  bssid_found = FALSE;
     guint     i;
 
@@ -3189,9 +3193,9 @@ wifi_list_rescan_retry_cb(gpointer user_data, GCancellable *cancellable)
 static void
 wifi_list_rescan_cb(GObject *source_object, GAsyncResult *res, gpointer user_data)
 {
-    NMDeviceWifi *wifi          = NM_DEVICE_WIFI(source_object);
+    NMDeviceWifi         *wifi  = NM_DEVICE_WIFI(source_object);
     gs_free_error GError *error = NULL;
-    WifiListData *        wifi_list_data;
+    WifiListData         *wifi_list_data;
     gboolean              force_finished;
     gboolean              done;
 
@@ -3248,7 +3252,7 @@ wifi_list_scan_timeout(gpointer user_data)
 }
 
 static void
-complete_aps(NMDevice ** devices,
+complete_aps(NMDevice  **devices,
              const char *ifname,
              const char *bssid_prefix,
              const char *ssid_prefix)
@@ -3272,21 +3276,21 @@ nmc_complete_bssid(NMClient *client, const char *ifname, const char *bssid_prefi
 static void
 do_device_wifi_list(const NMCCommand *cmd, NmCli *nmc, int argc, const char *const *argv)
 {
-    GError *    error                           = NULL;
-    NMDevice *  device                          = NULL;
-    const char *ifname                          = NULL;
-    const char *bssid_user                      = NULL;
-    const char *rescan                          = NULL;
-    gs_free NMDevice **              devices    = NULL;
-    const char *                     fields_str = NULL;
+    GError                          *error      = NULL;
+    NMDevice                        *device     = NULL;
+    const char                      *ifname     = NULL;
+    const char                      *bssid_user = NULL;
+    const char                      *rescan     = NULL;
+    gs_free NMDevice               **devices    = NULL;
+    const char                      *fields_str = NULL;
     const NMMetaAbstractInfo *const *tmpl;
-    gs_unref_array GArray *out_indices = NULL;
-    int                    option;
-    gint64                 rescan_cutoff_msec;
-    ScanInfo *             scan_info = NULL;
-    gboolean               ifname_handled;
-    NMDevice *             ifname_handled_candidate;
-    guint                  i, j;
+    gs_unref_array GArray           *out_indices = NULL;
+    int                              option;
+    gint64                           rescan_cutoff_msec;
+    ScanInfo                        *scan_info = NULL;
+    gboolean                         ifname_handled;
+    NMDevice                        *ifname_handled_candidate;
+    guint                            i, j;
 
     devices = nmc_get_devices_sorted(nmc->client);
 
@@ -3488,11 +3492,11 @@ do_device_wifi_list(const NMCCommand *cmd, NmCli *nmc, int argc, const char *con
 static void
 activate_update2_cb(GObject *source_object, GAsyncResult *res, gpointer user_data)
 {
-    NMRemoteConnection *remote_con   = NM_REMOTE_CONNECTION(source_object);
-    AddAndActivateInfo *info         = user_data;
-    NmCli *             nmc          = info->nmc;
-    gs_unref_variant GVariant *ret   = NULL;
-    GError *                   error = NULL;
+    NMRemoteConnection        *remote_con = NM_REMOTE_CONNECTION(source_object);
+    AddAndActivateInfo        *info       = user_data;
+    NmCli                     *nmc        = info->nmc;
+    gs_unref_variant GVariant *ret        = NULL;
+    GError                    *error      = NULL;
 
     ret = nm_remote_connection_update2_finish(remote_con, res, &error);
 
@@ -3515,11 +3519,11 @@ activate_update2_cb(GObject *source_object, GAsyncResult *res, gpointer user_dat
 }
 
 static void
-save_and_activate_connection(NmCli *       nmc,
-                             NMDevice *    device,
+save_and_activate_connection(NmCli        *nmc,
+                             NMDevice     *device,
                              NMConnection *connection,
                              gboolean      hotspot,
-                             const char *  specific_object)
+                             const char   *specific_object)
 {
     AddAndActivateInfo *info;
 
@@ -3551,29 +3555,29 @@ save_and_activate_connection(NmCli *       nmc,
 static void
 do_device_wifi_connect(const NMCCommand *cmd, NmCli *nmc, int argc, const char *const *argv)
 {
-    NMDevice *             device = NULL;
-    NMAccessPoint *        ap     = NULL;
-    NM80211ApFlags         ap_flags;
-    NM80211ApSecurityFlags ap_wpa_flags;
-    NM80211ApSecurityFlags ap_rsn_flags;
+    NMDevice                     *device = NULL;
+    NMAccessPoint                *ap     = NULL;
+    NM80211ApFlags                ap_flags;
+    NM80211ApSecurityFlags        ap_wpa_flags;
+    NM80211ApSecurityFlags        ap_rsn_flags;
     gs_unref_object NMConnection *connection = NULL;
-    NMSettingConnection *         s_con;
-    NMSettingWireless *           s_wifi;
-    const char *                  param_user = NULL;
-    const char *                  ifname     = NULL;
-    const char *                  bssid      = NULL;
-    const char *                  password   = NULL;
-    const char *                  con_name   = NULL;
+    NMSettingConnection          *s_con;
+    NMSettingWireless            *s_wifi;
+    const char                   *param_user = NULL;
+    const char                   *ifname     = NULL;
+    const char                   *bssid      = NULL;
+    const char                   *password   = NULL;
+    const char                   *con_name   = NULL;
     gboolean private                         = FALSE;
-    gboolean    hidden                       = FALSE;
-    gboolean    wep_passphrase               = FALSE;
-    GByteArray *bssid1_arr                   = NULL;
-    GByteArray *bssid2_arr                   = NULL;
+    gboolean           hidden                = FALSE;
+    gboolean           wep_passphrase        = FALSE;
+    GByteArray        *bssid1_arr            = NULL;
+    GByteArray        *bssid2_arr            = NULL;
     gs_free NMDevice **devices               = NULL;
     int                devices_idx;
-    char *             ssid_ask   = NULL;
-    char *             passwd_ask = NULL;
-    const GPtrArray *  avail_cons;
+    char              *ssid_ask   = NULL;
+    char              *passwd_ask = NULL;
+    const GPtrArray   *avail_cons;
     gboolean           name_match = FALSE;
     int                i;
 
@@ -3781,8 +3785,8 @@ do_device_wifi_connect(const NMCCommand *cmd, NmCli *nmc, int argc, const char *
     /* For hidden SSID first scan it so that NM learns about the AP */
     if (hidden) {
         GVariantBuilder builder, array_builder;
-        GVariant *      options;
-        GError *        scan_err = NULL;
+        GVariant       *options;
+        GError         *scan_err = NULL;
 
         g_variant_builder_init(&builder, G_VARIANT_TYPE_VARDICT);
         g_variant_builder_init(&array_builder, G_VARIANT_TYPE("aay"));
@@ -3840,7 +3844,7 @@ do_device_wifi_connect(const NMCCommand *cmd, NmCli *nmc, int argc, const char *
     avail_cons = nm_device_get_available_connections(device);
     for (i = 0; i < avail_cons->len; i++) {
         NMConnection *avail_con = g_ptr_array_index(avail_cons, i);
-        const char *  id        = nm_connection_get_id(NM_CONNECTION(avail_con));
+        const char   *id        = nm_connection_get_id(NM_CONNECTION(avail_con));
 
         if (con_name) {
             if (!id || strcmp(id, con_name))
@@ -3929,7 +3933,7 @@ do_device_wifi_connect(const NMCCommand *cmd, NmCli *nmc, int argc, const char *
         || (ap_rsn_flags != NM_802_11_AP_SEC_NONE
             && !NM_FLAGS_ANY(ap_rsn_flags,
                              NM_802_11_AP_SEC_KEY_MGMT_OWE | NM_802_11_AP_SEC_KEY_MGMT_OWE_TM))) {
-        const char *               con_password = NULL;
+        const char                *con_password = NULL;
         NMSettingWirelessSecurity *s_wsec       = NULL;
 
         if (connection) {
@@ -4006,7 +4010,7 @@ static GBytes *
 generate_ssid_for_hotspot(void)
 {
     GBytes *ssid_bytes;
-    char *  ssid = NULL;
+    char   *ssid = NULL;
 
     ssid = g_strdup_printf("Hotspot-%s", g_get_host_name());
     if (strlen(ssid) > 32)
@@ -4059,11 +4063,11 @@ generate_wep_key(char *key, size_t len)
 
 static gboolean
 set_wireless_security_for_hotspot(NMSettingWirelessSecurity *s_wsec,
-                                  const char *               wifi_mode,
+                                  const char                *wifi_mode,
                                   NMDeviceWifiCapabilities   caps,
-                                  const char *               password,
+                                  const char                *password,
                                   gboolean                   show_password,
-                                  GError **                  error)
+                                  GError                   **error)
 {
     char        generated_key[11];
     const char *key;
@@ -4135,15 +4139,15 @@ set_wireless_security_for_hotspot(NMSettingWirelessSecurity *s_wsec,
 }
 
 static NMConnection *
-find_hotspot_conn(NMDevice *       device,
+find_hotspot_conn(NMDevice        *device,
                   const GPtrArray *connections,
-                  const char *     con_name,
-                  GBytes *         ssid_bytes,
-                  const char *     wifi_mode,
-                  const char *     band,
+                  const char      *con_name,
+                  GBytes          *ssid_bytes,
+                  const char      *wifi_mode,
+                  const char      *band,
                   gint64           channel_int)
 {
-    NMConnection *     connection;
+    NMConnection      *connection;
     NMSettingWireless *s_wifi;
     int                i;
 
@@ -4177,19 +4181,19 @@ find_hotspot_conn(NMDevice *       device,
 
 static NMConnection *
 create_hotspot_conn(const GPtrArray *connections,
-                    const char *     con_name,
-                    GBytes *         ssid_bytes,
-                    const char *     wifi_mode,
-                    const char *     band,
+                    const char      *con_name,
+                    GBytes          *ssid_bytes,
+                    const char      *wifi_mode,
+                    const char      *band,
                     gint64           channel_int)
 {
-    char *                     default_name = NULL;
-    NMConnection *             connection;
-    NMSettingConnection *      s_con;
-    NMSettingWireless *        s_wifi;
+    char                      *default_name = NULL;
+    NMConnection              *connection;
+    NMSettingConnection       *s_con;
+    NMSettingWireless         *s_wifi;
     NMSettingWirelessSecurity *s_wsec;
-    NMSettingIPConfig *        s_ip4, *s_ip6;
-    NMSettingProxy *           s_proxy;
+    NMSettingIPConfig         *s_ip4, *s_ip6;
+    NMSettingProxy            *s_proxy;
 
     connection = nm_simple_connection_new();
     s_con      = (NMSettingConnection *) nm_setting_connection_new();
@@ -4244,22 +4248,22 @@ create_hotspot_conn(const GPtrArray *connections,
 static void
 do_device_wifi_hotspot(const NMCCommand *cmd, NmCli *nmc, int argc, const char *const *argv)
 {
-    const char *   ifname             = NULL;
-    const char *   con_name           = NULL;
-    gs_unref_bytes GBytes *ssid_bytes = NULL;
-    const char *           wifi_mode;
-    const char *           band          = NULL;
-    const char *           channel       = NULL;
-    gint64                 channel_int   = -1;
-    const char *           password      = NULL;
-    gboolean               show_password = FALSE;
-    NMDevice *             device        = NULL;
-    gs_free NMDevice **      devices     = NULL;
-    NMDeviceWifiCapabilities caps;
+    const char                   *ifname     = NULL;
+    const char                   *con_name   = NULL;
+    gs_unref_bytes GBytes        *ssid_bytes = NULL;
+    const char                   *wifi_mode;
+    const char                   *band          = NULL;
+    const char                   *channel       = NULL;
+    gint64                        channel_int   = -1;
+    const char                   *password      = NULL;
+    gboolean                      show_password = FALSE;
+    NMDevice                     *device        = NULL;
+    gs_free NMDevice            **devices       = NULL;
+    NMDeviceWifiCapabilities      caps;
     gs_unref_object NMConnection *connection = NULL;
-    const GPtrArray *             connections;
-    NMSettingWirelessSecurity *   s_wsec;
-    GError *                      error = NULL;
+    const GPtrArray              *connections;
+    NMSettingWirelessSecurity    *s_wsec;
+    GError                       *error = NULL;
 
     /* Set default timeout waiting for operation completion. */
     if (nmc->timeout == -1)
@@ -4459,7 +4463,7 @@ do_device_wifi_hotspot(const NMCCommand *cmd, NmCli *nmc, int argc, const char *
 static void
 request_rescan_cb(GObject *object, GAsyncResult *result, gpointer user_data)
 {
-    NmCli * nmc   = (NmCli *) user_data;
+    NmCli  *nmc   = (NmCli *) user_data;
     GError *error = NULL;
 
     nm_device_wifi_request_scan_finish(NM_DEVICE_WIFI(object), result, &error);
@@ -4474,13 +4478,13 @@ request_rescan_cb(GObject *object, GAsyncResult *result, gpointer user_data)
 static void
 do_device_wifi_rescan(const NMCCommand *cmd, NmCli *nmc, int argc, const char *const *argv)
 {
-    NMDevice *        device;
-    const char *      ifname           = NULL;
-    gs_unref_ptrarray GPtrArray *ssids = NULL;
-    gs_free NMDevice **devices         = NULL;
-    GVariantBuilder    builder, array_builder;
-    GVariant *         options;
-    int                i;
+    NMDevice                    *device;
+    const char                  *ifname  = NULL;
+    gs_unref_ptrarray GPtrArray *ssids   = NULL;
+    gs_free NMDevice           **devices = NULL;
+    GVariantBuilder              builder, array_builder;
+    GVariant                    *options;
+    int                          i;
 
     ssids   = g_ptr_array_new();
     devices = nmc_get_devices_sorted(nmc->client);
@@ -4599,13 +4603,13 @@ string_append_mecard(GString *string, const char *tag, const char *text)
 static void
 print_wifi_connection(const NmcConfig *nmc_config, NMConnection *connection)
 {
-    NMSettingWireless *        s_wireless;
-    NMSettingWirelessSecurity *s_wsec;
-    const char *               key_mgmt = NULL;
-    const char *               psk      = NULL;
-    const char *               type     = NULL;
-    GBytes *                   ssid_bytes;
-    gs_free char *             ssid      = NULL;
+    NMSettingWireless            *s_wireless;
+    NMSettingWirelessSecurity    *s_wsec;
+    const char                   *key_mgmt = NULL;
+    const char                   *psk      = NULL;
+    const char                   *type     = NULL;
+    GBytes                       *ssid_bytes;
+    gs_free char                 *ssid   = NULL;
     nm_auto_free_gstring GString *string = NULL;
 
     s_wireless = nm_connection_get_setting_wireless(connection);
@@ -4661,9 +4665,9 @@ print_wifi_connection(const NmcConfig *nmc_config, NMConnection *connection)
 static gboolean
 wifi_show_device(const NmcConfig *nmc_config, NMDevice *device, GError **error)
 {
-    NMActiveConnection *active_conn;
+    NMActiveConnection           *active_conn;
     gs_unref_object NMConnection *connection = NULL;
-    gs_unref_variant GVariant *secrets       = NULL;
+    gs_unref_variant GVariant    *secrets    = NULL;
 
     if (!NM_IS_DEVICE_WIFI(device)) {
         g_set_error(error,
@@ -4708,10 +4712,10 @@ wifi_show_device(const NmcConfig *nmc_config, NMDevice *device, GError **error)
 static void
 do_device_wifi_show_password(const NMCCommand *cmd, NmCli *nmc, int argc, const char *const *argv)
 {
-    const char *ifname          = NULL;
-    gs_free NMDevice **devices  = NULL;
-    gs_free_error GError *error = NULL;
-    gboolean              found = FALSE;
+    const char           *ifname  = NULL;
+    gs_free NMDevice    **devices = NULL;
+    gs_free_error GError *error   = NULL;
+    gboolean              found   = FALSE;
     int                   i;
 
     devices = nmc_get_devices_sorted(nmc->client);
@@ -4795,9 +4799,9 @@ static int
 show_device_lldp_list(NMDevice *device, NmCli *nmc, const char *fields_str, int *counter)
 {
     const NMMetaAbstractInfo *const *tmpl;
-    NmcOutputField *                 arr;
-    GPtrArray *                      neighbors;
-    const char *                     str;
+    NmcOutputField                  *arr;
+    GPtrArray                       *neighbors;
+    const char                      *str;
     int                              i;
     NMC_OUTPUT_DATA_DEFINE_SCOPED(out);
     gs_free char *header_name = NULL;
@@ -4894,10 +4898,10 @@ show_device_lldp_list(NMDevice *device, NmCli *nmc, const char *fields_str, int
 static void
 do_device_lldp_list(const NMCCommand *cmd, NmCli *nmc, int argc, const char *const *argv)
 {
-    NMDevice *    device               = NULL;
-    gs_free_error GError *error        = NULL;
-    const char *          fields_str   = NULL;
-    int                   counter      = 0;
+    NMDevice              *device      = NULL;
+    gs_free_error GError  *error       = NULL;
+    const char            *fields_str  = NULL;
+    int                    counter     = 0;
     gs_unref_array GArray *out_indices = NULL;
 
     next_arg(nmc, &argc, &argv, NULL);
@@ -4996,7 +5000,7 @@ is_single_word(const char *line)
 static char **
 nmcli_device_tab_completion(const char *text, int start, int end)
 {
-    char **              match_array    = NULL;
+    char               **match_array    = NULL;
     rl_compentry_func_t *generator_func = NULL;
 
     /* Disable readline's default filename completion */
diff --git a/src/nmcli/general.c b/src/nmcli/general.c
index d87df17a..65437e79 100644
--- a/src/nmcli/general.c
+++ b/src/nmcli/general.c
@@ -108,10 +108,11 @@ static NM_UTILS_LOOKUP_DEFINE(
 
 static const NmcMetaGenericInfo *const metagen_general_status[];
 
-static gconstpointer _metagen_general_status_get_fcn(NMC_META_GENERIC_INFO_GET_FCN_ARGS)
+static gconstpointer
+_metagen_general_status_get_fcn(NMC_META_GENERIC_INFO_GET_FCN_ARGS)
 {
-    NmCli *             nmc = target;
-    const char *        value;
+    NmCli              *nmc = target;
+    const char         *value;
     gboolean            v_bool;
     NMState             state;
     NMConnectivityState connectivity;
@@ -209,12 +210,13 @@ static const NmcMetaGenericInfo
 
 /*****************************************************************************/
 
-static gconstpointer _metagen_general_permissions_get_fcn(NMC_META_GENERIC_INFO_GET_FCN_ARGS)
+static gconstpointer
+_metagen_general_permissions_get_fcn(NMC_META_GENERIC_INFO_GET_FCN_ARGS)
 {
     NMClientPermission       perm = GPOINTER_TO_UINT(target);
-    NmCli *                  nmc  = environment_user_data;
+    NmCli                   *nmc  = environment_user_data;
     NMClientPermissionResult perm_result;
-    const char *             s;
+    const char              *s;
 
     switch (info->info_type) {
     case NMC_GENERIC_INFO_TYPE_GENERAL_PERMISSIONS_PERMISSION:
@@ -252,9 +254,10 @@ typedef struct {
     char **domains;
 } GetGeneralLoggingData;
 
-static gconstpointer _metagen_general_logging_get_fcn(NMC_META_GENERIC_INFO_GET_FCN_ARGS)
+static gconstpointer
+_metagen_general_logging_get_fcn(NMC_META_GENERIC_INFO_GET_FCN_ARGS)
 {
-    NmCli *                nmc = environment_user_data;
+    NmCli                 *nmc = environment_user_data;
     GetGeneralLoggingData *d   = target;
 
     nm_assert(info->info_type < _NMC_GENERIC_INFO_TYPE_GENERAL_LOGGING_NUM);
@@ -466,9 +469,9 @@ static gboolean
 show_nm_status(NmCli *nmc, const char *pretty_header_name, const char *print_flds)
 {
     gs_free_error GError *error = NULL;
-    const char *          fields_str;
-    const char *          fields_all    = print_flds ?: NMC_FIELDS_NM_STATUS_ALL;
-    const char *          fields_common = print_flds ?: NMC_FIELDS_NM_STATUS_COMMON;
+    const char           *fields_str;
+    const char           *fields_all    = print_flds ?: NMC_FIELDS_NM_STATUS_ALL;
+    const char           *fields_common = print_flds ?: NMC_FIELDS_NM_STATUS_COMMON;
 
     if (!nmc->required_fields || g_ascii_strcasecmp(nmc->required_fields, "common") == 0)
         fields_str = fields_common;
@@ -519,9 +522,9 @@ timeout_cb(gpointer user_data)
 static void
 print_permissions(void *user_data)
 {
-    NmCli *       nmc                = user_data;
+    NmCli                *nmc        = user_data;
     gs_free_error GError *error      = NULL;
-    const char *          fields_str = NULL;
+    const char           *fields_str = NULL;
     gpointer              permissions[G_N_ELEMENTS(nm_auth_permission_sorted) + 1];
     gboolean              is_running;
     int                   i;
@@ -603,9 +606,9 @@ show_nm_permissions(NmCli *nmc)
 static void
 reload_cb(GObject *source, GAsyncResult *result, gpointer user_data)
 {
-    NmCli *       nmc              = user_data;
-    gs_free_error GError *error    = NULL;
-    gs_unref_variant GVariant *ret = NULL;
+    NmCli                     *nmc   = user_data;
+    gs_free_error GError      *error = NULL;
+    gs_unref_variant GVariant *ret   = NULL;
 
     ret = nm_dbus_call_finish(result, &error);
     if (error) {
@@ -622,8 +625,8 @@ static void
 do_general_reload(const NMCCommand *cmd, NmCli *nmc, int argc, const char *const *argv)
 {
     gs_free const char **values    = NULL;
-    gs_free char *       err_token = NULL;
-    gs_free char *       joined    = NULL;
+    gs_free char        *err_token = NULL;
+    gs_free char        *joined    = NULL;
     int                  flags     = 0;
 
     next_arg(nmc, &argc, &argv, NULL);
@@ -694,13 +697,13 @@ do_general_permissions(const NMCCommand *cmd, NmCli *nmc, int argc, const char *
 static void
 show_general_logging(NmCli *nmc)
 {
-    gs_free char *level_cache        = NULL;
-    gs_free char *domains_cache      = NULL;
-    gs_free_error GError *error      = NULL;
-    const char *          fields_str = NULL;
-    GetGeneralLoggingData d          = {
-        .level   = &level_cache,
-        .domains = &domains_cache,
+    gs_free char         *level_cache   = NULL;
+    gs_free char         *domains_cache = NULL;
+    gs_free_error GError *error         = NULL;
+    const char           *fields_str    = NULL;
+    GetGeneralLoggingData d             = {
+                    .level   = &level_cache,
+                    .domains = &domains_cache,
     };
 
     if (!nmc->required_fields || g_ascii_strcasecmp(nmc->required_fields, "common") == 0) {
@@ -742,9 +745,9 @@ nmc_complete_strings_nocase(const char *prefix, ...)
 static void
 _set_logging_cb(GObject *object, GAsyncResult *result, gpointer user_data)
 {
-    NmCli *          nmc           = user_data;
-    gs_unref_variant GVariant *res = NULL;
-    gs_free_error GError *error    = NULL;
+    NmCli                     *nmc   = user_data;
+    gs_unref_variant GVariant *res   = NULL;
+    gs_free_error GError      *error = NULL;
 
     res = nm_client_dbus_call_finish(NM_CLIENT(object), result, &error);
     if (!res) {
@@ -878,7 +881,7 @@ do_general_logging(const NMCCommand *cmd, NmCli *nmc, int argc, const char *cons
 static void
 save_hostname_cb(GObject *object, GAsyncResult *result, gpointer user_data)
 {
-    NmCli *       nmc           = user_data;
+    NmCli                *nmc   = user_data;
     gs_free_error GError *error = NULL;
 
     nm_client_save_hostname_finish(NM_CLIENT(object), result, &error);
@@ -984,9 +987,9 @@ nmc_switch_parse_on_off(NmCli *nmc, const char *arg1, const char *arg2, gboolean
 static void
 _do_networking_on_off_cb(GObject *object, GAsyncResult *result, gpointer user_data)
 {
-    NmCli *          nmc           = user_data;
-    gs_unref_variant GVariant *ret = NULL;
-    gs_free_error GError *error    = NULL;
+    NmCli                     *nmc   = user_data;
+    gs_unref_variant GVariant *ret   = NULL;
+    gs_free_error GError      *error = NULL;
 
     ret = nm_client_dbus_call_finish(NM_CLIENT(object), result, &error);
     if (!ret) {
@@ -1119,7 +1122,7 @@ do_radio_all(const NMCCommand *cmd, NmCli *nmc, int argc, const char *const *arg
 static void
 _do_radio_wifi_cb(GObject *object, GAsyncResult *result, gpointer user_data)
 {
-    NmCli *       nmc           = user_data;
+    NmCli                *nmc   = user_data;
     gs_free_error GError *error = NULL;
 
     if (!nm_client_dbus_set_property_finish(NM_CLIENT(object), result, &error)) {
@@ -1214,7 +1217,7 @@ static void
 networkmanager_running(NMClient *client, GParamSpec *param, NmCli *nmc)
 {
     gboolean running;
-    char *   str;
+    char    *str;
 
     running = nm_client_get_nm_running(client);
     str     = nmc_colorize(&nmc->nmc_config,
@@ -1237,7 +1240,7 @@ static void
 client_primary_connection(NMClient *client, GParamSpec *param, NmCli *nmc)
 {
     NMActiveConnection *primary;
-    const char *        id;
+    const char         *id;
 
     primary = nm_client_get_primary_connection(client);
     if (primary) {
@@ -1255,7 +1258,7 @@ static void
 client_connectivity(NMClient *client, GParamSpec *param, NmCli *nmc)
 {
     NMConnectivityState connectivity;
-    char *              str;
+    char               *str;
 
     g_object_get(client, NM_CLIENT_CONNECTIVITY, &connectivity, NULL);
     str = nmc_colorize(&nmc->nmc_config,
@@ -1270,7 +1273,7 @@ static void
 client_state(NMClient *client, GParamSpec *param, NmCli *nmc)
 {
     NMState state;
-    char *  str;
+    char   *str;
 
     g_object_get(client, NM_CLIENT_STATE, &state, NULL);
     str = nmc_colorize(&nmc->nmc_config,
@@ -1284,8 +1287,8 @@ client_state(NMClient *client, GParamSpec *param, NmCli *nmc)
 static void
 device_overview(NmCli *nmc, NMDevice *device)
 {
-    GString *        outbuf = g_string_sized_new(80);
-    char *           tmp;
+    GString         *outbuf = g_string_sized_new(80);
+    char            *tmp;
     const GPtrArray *activatable;
 
     activatable = nm_device_get_available_connections(device);
@@ -1392,8 +1395,8 @@ device_overview(NmCli *nmc, NMDevice *device)
 static void
 ac_overview(NmCli *nmc, NMActiveConnection *ac)
 {
-    GString *                outbuf = g_string_sized_new(80);
-    NMIPConfig *             ip;
+    GString                 *outbuf = g_string_sized_new(80);
+    NMIPConfig              *ip;
     nm_auto_str_buf NMStrBuf str = NM_STR_BUF_INIT(NM_UTILS_GET_NEXT_REALLOC_SIZE_104, FALSE);
 
     if (nm_active_connection_get_master(ac)) {
@@ -1463,12 +1466,12 @@ ac_overview(NmCli *nmc, NMActiveConnection *ac)
 void
 nmc_command_func_overview(const NMCCommand *cmd, NmCli *nmc, int argc, const char *const *argv)
 {
-    NMDevice **         devices;
-    const GPtrArray *   p;
+    NMDevice          **devices;
+    const GPtrArray    *p;
     NMActiveConnection *ac;
     NMMetaColor         color;
-    NMDnsEntry *        dns;
-    char *              tmp;
+    NMDnsEntry         *dns;
+    char               *tmp;
     int                 i;
 
     next_arg(nmc, &argc, &argv, NULL);
diff --git a/src/nmcli/generate-docs-nm-settings-nmcli.c b/src/nmcli/generate-docs-nm-settings-nmcli.c
index cd1bb670..196e4d35 100644
--- a/src/nmcli/generate-docs-nm-settings-nmcli.c
+++ b/src/nmcli/generate-docs-nm-settings-nmcli.c
@@ -34,8 +34,8 @@ main(int argc, char *argv[])
     for (i_sett_infos = 0; i_sett_infos < G_N_ELEMENTS(nm_meta_setting_infos_editor);
          i_sett_infos++) {
         const NMMetaSettingInfoEditor *sett_info = &nm_meta_setting_infos_editor[i_sett_infos];
-        gs_free char *                 tmp_s1    = NULL;
-        gs_free char *                 tmp_s2    = NULL;
+        gs_free char                  *tmp_s1    = NULL;
+        gs_free char                  *tmp_s2    = NULL;
 
         g_print("%s<setting", _indent_level(INDENT));
         g_print(" name=%s", tmp_s1 = _xml_escape_attribute(sett_info->general->setting_name));
@@ -47,9 +47,9 @@ main(int argc, char *argv[])
 
         for (i_property = 0; i_property < sett_info->properties_num; i_property++) {
             const NMMetaPropertyInfo *prop_info = sett_info->properties[i_property];
-            gs_free char *            tmp2      = NULL;
-            gs_free char *            tmp3      = NULL;
-            gs_free char *            tmp4      = NULL;
+            gs_free char             *tmp2      = NULL;
+            gs_free char             *tmp3      = NULL;
+            gs_free char             *tmp4      = NULL;
 
             g_print("%s<property", _indent_level(2 * INDENT));
             g_print(" name=%s", tmp2 = _xml_escape_attribute(prop_info->property_name));
diff --git a/src/nmcli/generate-docs-nm-settings-nmcli.xml b/src/nmcli/generate-docs-nm-settings-nmcli.xml
index 02fd8800..1d329305 100644
--- a/src/nmcli/generate-docs-nm-settings-nmcli.xml
+++ b/src/nmcli/generate-docs-nm-settings-nmcli.xml
@@ -818,6 +818,8 @@
     <setting name="ovs-dpdk" >
         <property name="devargs"
                   description="Open vSwitch DPDK device arguments." />
+        <property name="n-rxq"
+                  description="Open vSwitch DPDK number of rx queues. Defaults to zero which means to leave the parameter in OVS unspecified and effectively configures one queue." />
     </setting>
     <setting name="ovs-external-ids" >
     </setting>
diff --git a/src/nmcli/generate-docs-nm-settings-nmcli.xml.in b/src/nmcli/generate-docs-nm-settings-nmcli.xml.in
index 02fd8800..1d329305 100644
--- a/src/nmcli/generate-docs-nm-settings-nmcli.xml.in
+++ b/src/nmcli/generate-docs-nm-settings-nmcli.xml.in
@@ -818,6 +818,8 @@
     <setting name="ovs-dpdk" >
         <property name="devargs"
                   description="Open vSwitch DPDK device arguments." />
+        <property name="n-rxq"
+                  description="Open vSwitch DPDK number of rx queues. Defaults to zero which means to leave the parameter in OVS unspecified and effectively configures one queue." />
     </setting>
     <setting name="ovs-external-ids" >
     </setting>
diff --git a/src/nmcli/nmcli.c b/src/nmcli/nmcli.c
index b2b2cd81..fae40584 100644
--- a/src/nmcli/nmcli.c
+++ b/src/nmcli/nmcli.c
@@ -118,7 +118,7 @@ typedef struct {
 } ArgsInfo;
 
 /* --- Global variables --- */
-GMainLoop *    loop = NULL;
+GMainLoop     *loop = NULL;
 struct termios termios_orig;
 
 NM_CACHED_QUARK_FCN("nmcli-error-quark", nmcli_error_quark);
@@ -150,10 +150,10 @@ static void
 complete_one(gpointer key, gpointer value, gpointer user_data)
 {
     const char **option_with_value = user_data;
-    const char * option            = option_with_value[0];
-    const char * prefix            = option_with_value[1];
-    const char * name              = key;
-    const char * last;
+    const char  *option            = option_with_value[0];
+    const char  *prefix            = option_with_value[1];
+    const char  *name              = key;
+    const char  *last;
 
     last = strrchr(prefix, ',');
     if (last)
@@ -272,9 +272,9 @@ static gboolean
 matches_arg(NmCli *nmc, int *argc, const char *const **argv, const char *pattern, char **arg)
 {
     gs_free char *opt_free = NULL;
-    const char *  opt      = (*argv)[0];
+    const char   *opt      = (*argv)[0];
     gs_free char *arg_tmp  = NULL;
-    const char *  s;
+    const char   *s;
 
     nm_assert(opt);
     nm_assert(opt[0] == '-');
@@ -377,7 +377,7 @@ check_colors_check_palette_one_file(const char *base_dir, const char *name, cons
 
     for (i = 0; i < G_N_ELEMENTS(extensions); i++) {
         gs_free char *filename = NULL;
-        char *        contents;
+        char         *contents;
 
         filename = check_colors_construct_filename(base_dir, name, term, extensions[i]);
         if (g_file_get_contents(filename, &contents, NULL, NULL))
@@ -470,9 +470,9 @@ check_colors_check_palette(const char *base_dir_1,
 static gboolean
 check_colors(NmcColorOption color_option, char **out_palette_str)
 {
-    const char *      base_dir_1, *base_dir_2;
+    const char       *base_dir_1, *base_dir_2;
     const char *const NAME = "nmcli";
-    const char *      term;
+    const char       *term;
 
     *out_palette_str = NULL;
 
@@ -681,8 +681,8 @@ parse_color_scheme(char *palette_buffer, NmcColorPalette *out_palette, GError **
 
 static void
 set_colors(NmcColorOption   color_option,
-           bool *           out_use_colors,
-           char **          out_palette_buffer,
+           bool            *out_use_colors,
+           char           **out_palette_buffer,
            NmcColorPalette *out_palette)
 {
     gs_free char *palette_str = NULL;
@@ -730,7 +730,7 @@ process_command_line(NmCli *nmc, int argc, char **argv_orig)
         {NULL, nmc_command_func_overview, usage, TRUE, TRUE},
     };
     NmcColorOption     colors = NMC_USE_COLOR_AUTO;
-    const char *       base;
+    const char        *base;
     const char *const *argv;
 
     base = strrchr(argv_orig[0], '/');
diff --git a/src/nmcli/nmcli.h b/src/nmcli/nmcli.h
index f1303378..157aae99 100644
--- a/src/nmcli/nmcli.h
+++ b/src/nmcli/nmcli.h
@@ -85,7 +85,7 @@ typedef struct _NmcMetaGenericInfo NmcMetaGenericInfo;
 struct _NmcOutputField {
     const NMMetaAbstractInfo *info;
     int                       width; /* Width in screen columns */
-    void *      value; /* Value of current field - char* or char** (NULL-terminated array) */
+    void       *value; /* Value of current field - char* or char** (NULL-terminated array) */
     gboolean    value_is_array; /* Whether value is char** instead of char* */
     gboolean    free_value;     /* Whether to free the value */
     NmcOfFlags  flags;          /* Flags - whether and how to print values/field names/headers */
@@ -118,14 +118,14 @@ typedef struct _NmCli {
     NMClient *client; /* Pointer to NMClient of libnm */
 
     NMCResultCode return_value; /* Return code of nmcli */
-    GString *     return_text;  /* Reason text */
+    GString      *return_text;  /* Reason text */
 
     NmcPagerData pager_data;
 
     int timeout; /* Operation timeout */
 
-    NMSecretAgentSimple *     secret_agent; /* Secret agent */
-    GHashTable *              pwds_hash;    /* Hash table with passwords in passwd-file */
+    NMSecretAgentSimple      *secret_agent; /* Secret agent */
+    GHashTable               *pwds_hash;    /* Hash table with passwords in passwd-file */
     struct _NMPolkitListener *pk_listener;  /* polkit agent listener */
 
     int      should_wait;    /* Semaphore indicating whether nmcli should not end or not yet */
@@ -135,7 +135,7 @@ typedef struct _NmCli {
         const NmcConfig nmc_config;
         NmcConfig       nmc_config_mutable;
     };
-    char *   required_fields;    /* Required fields in output: '--fields' option */
+    char    *required_fields;    /* Required fields in output: '--fields' option */
     gboolean ask;                /* Ask for missing parameters: option '--ask' */
     gboolean complete;           /* Autocomplete the command line */
     gboolean editor_status_line; /* Whether to display status line in connection editor */
@@ -163,9 +163,9 @@ void nm_cli_spawn_pager(const NmcConfig *nmc_config, NmcPagerData *pager_data);
 void nmc_empty_output_fields(NmcOutputData *output_data);
 
 #define NMC_OUTPUT_DATA_DEFINE_SCOPED(out)                               \
-    gs_unref_array GArray *                        out##_indices = NULL; \
+    gs_unref_array GArray                         *out##_indices = NULL; \
     nm_auto(nmc_empty_output_fields) NmcOutputData out           = {     \
-        .output_data = g_ptr_array_new_full(20, g_free),       \
+                  .output_data = g_ptr_array_new_full(20, g_free),       \
     }
 
 /*****************************************************************************/
diff --git a/src/nmcli/polkit-agent.c b/src/nmcli/polkit-agent.c
index 7776d7e7..41567023 100644
--- a/src/nmcli/polkit-agent.c
+++ b/src/nmcli/polkit-agent.c
@@ -43,7 +43,7 @@ gboolean
 nmc_polkit_agent_init(NmCli *nmc, gboolean for_session, GError **error)
 {
     NMPolkitListener *listener;
-    GDBusConnection * dbus_connection = NULL;
+    GDBusConnection  *dbus_connection = NULL;
 
     g_return_val_if_fail(error == NULL || *error == NULL, FALSE);
 
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);
 
diff --git a/src/nmcli/settings.h b/src/nmcli/settings.h
index 2dbe7607..9cbf13c4 100644
--- a/src/nmcli/settings.h
+++ b/src/nmcli/settings.h
@@ -17,20 +17,20 @@ void nmc_setting_ip6_connect_handlers(NMSettingIPConfig *setting);
 void nmc_setting_proxy_connect_handlers(NMSettingProxy *setting);
 void nmc_setting_wireless_connect_handlers(NMSettingWireless *setting);
 void nmc_setting_connection_connect_handlers(NMSettingConnection *setting,
-                                             NMConnection *       connection);
+                                             NMConnection        *connection);
 
 char **nmc_setting_get_valid_properties(NMSetting *setting);
-char * nmc_setting_get_property_desc(NMSetting *setting, const char *prop);
+char  *nmc_setting_get_property_desc(NMSetting *setting, const char *prop);
 const char *const *
 nmc_setting_get_property_allowed_values(NMSetting *setting, const char *prop, char ***out_to_free);
-char *   nmc_setting_get_property(NMSetting *setting, const char *prop, GError **error);
-char *   nmc_setting_get_property_parsable(NMSetting *setting, const char *prop, GError **error);
-gboolean nmc_setting_set_property(NMClient *             client,
-                                  NMSetting *            setting,
-                                  const char *           prop,
+char    *nmc_setting_get_property(NMSetting *setting, const char *prop, GError **error);
+char    *nmc_setting_get_property_parsable(NMSetting *setting, const char *prop, GError **error);
+gboolean nmc_setting_set_property(NMClient              *client,
+                                  NMSetting             *setting,
+                                  const char            *prop,
                                   NMMetaAccessorModifier modifier,
-                                  const char *           val,
-                                  GError **              error);
+                                  const char            *val,
+                                  GError               **error);
 
 gboolean setting_details(const NmcConfig *nmc_config, NMSetting *setting, const char *one_prop);
 
diff --git a/src/nmcli/utils.c b/src/nmcli/utils.c
index 85768c19..7645a08c 100644
--- a/src/nmcli/utils.c
+++ b/src/nmcli/utils.c
@@ -40,8 +40,8 @@ _meta_type_nmc_generic_info_get_name(const NMMetaAbstractInfo *abstract_info, gb
 
 static const NMMetaAbstractInfo *const *
 _meta_type_nmc_generic_info_get_nested(const NMMetaAbstractInfo *abstract_info,
-                                       guint *                   out_len,
-                                       gpointer *                out_to_free)
+                                       guint                    *out_len,
+                                       gpointer                 *out_to_free)
 {
     const NmcMetaGenericInfo *info;
 
@@ -52,16 +52,16 @@ _meta_type_nmc_generic_info_get_nested(const NMMetaAbstractInfo *abstract_info,
 }
 
 static gconstpointer
-_meta_type_nmc_generic_info_get_fcn(const NMMetaAbstractInfo * abstract_info,
-                                    const NMMetaEnvironment *  environment,
+_meta_type_nmc_generic_info_get_fcn(const NMMetaAbstractInfo  *abstract_info,
+                                    const NMMetaEnvironment   *environment,
                                     gpointer                   environment_user_data,
                                     gpointer                   target,
                                     gpointer                   target_data,
                                     NMMetaAccessorGetType      get_type,
                                     NMMetaAccessorGetFlags     get_flags,
                                     NMMetaAccessorGetOutFlags *out_flags,
-                                    gboolean *                 out_is_default,
-                                    gpointer *                 out_to_free)
+                                    gboolean                  *out_is_default,
+                                    gpointer                  *out_to_free)
 {
     const NmcMetaGenericInfo *info = (const NmcMetaGenericInfo *) abstract_info;
 
@@ -244,11 +244,11 @@ nmc_arg_is_option(const char *str, const char *opt_name)
  * Returns: TRUE on success, FALSE on an error and sets 'error'
  */
 gboolean
-nmc_parse_args(nmc_arg_t *         arg_arr,
+nmc_parse_args(nmc_arg_t          *arg_arr,
                gboolean            last,
-               int *               argc,
+               int                *argc,
                const char *const **argv,
-               GError **           error)
+               GError            **error)
 {
     nmc_arg_t *p;
     gboolean   found;
@@ -376,7 +376,7 @@ nmc_colorize(const NmcConfig *nmc_config, NMMetaColor color, const char *fmt, ..
 {
     va_list       args;
     gs_free char *str      = NULL;
-    const char *  ansi_seq = NULL;
+    const char   *ansi_seq = NULL;
 
     va_start(args, fmt);
     str = g_strdup_vprintf(fmt, args);
@@ -423,7 +423,7 @@ void
 nmc_filter_out_colors_inplace(char *str)
 {
     const char *p1;
-    char *      p2;
+    char       *p2;
     gboolean    copy_char = TRUE;
 
     if (!str)
@@ -463,7 +463,7 @@ nmc_filter_out_colors(const char *str)
 char *
 nmc_get_user_input(const char *ask_str)
 {
-    char *  line    = NULL;
+    char   *line    = NULL;
     size_t  line_ln = 0;
     ssize_t num;
 
@@ -489,11 +489,11 @@ int
 nmc_string_to_arg_array(const char *line,
                         const char *delim,
                         gboolean    unquote,
-                        char ***    argv,
-                        int *       argc)
+                        char     ***argv,
+                        int        *argc)
 {
     gs_free const char **arr0 = NULL;
-    char **              arr;
+    char               **arr;
 
     arr0 = nm_strsplit_set(line ?: "", delim ?: " \t");
     if (!arr0)
@@ -503,7 +503,7 @@ nmc_string_to_arg_array(const char *line,
 
     if (unquote) {
         int         i = 0;
-        char *      s;
+        char       *s;
         size_t      l;
         const char *quotes = "\"'";
 
@@ -658,17 +658,17 @@ typedef struct _PrintDataCol {
 } PrintDataCol;
 
 static gboolean
-_output_selection_append(GArray *                   cols,
+_output_selection_append(GArray                    *cols,
                          guint                      parent_idx,
                          const NMMetaSelectionItem *selection_item,
-                         GPtrArray *                gfree_keeper,
-                         GError **                  error)
+                         GPtrArray                 *gfree_keeper,
+                         GError                   **error)
 {
     gs_free gpointer                 nested_to_free = NULL;
     guint                            col_idx;
     guint                            i;
     const NMMetaAbstractInfo *const *nested;
-    NMMetaSelectionResultList *      selection;
+    NMMetaSelectionResultList       *selection;
 
     col_idx = cols->len;
 
@@ -787,16 +787,16 @@ _output_selection_complete(GArray *cols)
  */
 static gboolean
 _output_selection_parse(const NMMetaAbstractInfo *const *fields,
-                        const char *                     fields_str,
-                        PrintDataCol **                  out_cols_data,
-                        guint *                          out_cols_len,
-                        GPtrArray **                     out_gfree_keeper,
-                        GError **                        error)
+                        const char                      *fields_str,
+                        PrintDataCol                   **out_cols_data,
+                        guint                           *out_cols_len,
+                        GPtrArray                      **out_gfree_keeper,
+                        GError                         **error)
 {
-    NMMetaSelectionResultList *selection;
+    NMMetaSelectionResultList   *selection;
     gs_unref_ptrarray GPtrArray *gfree_keeper = NULL;
-    gs_unref_array GArray *cols               = NULL;
-    guint                  i;
+    gs_unref_array GArray       *cols         = NULL;
+    guint                        i;
 
     selection = nm_meta_selection_create_parse_list(fields, fields_str, FALSE, error);
     if (!selection)
@@ -853,15 +853,15 @@ _output_selection_parse(const NMMetaAbstractInfo *const *fields,
  *   Caller is responsible for freeing the array.
  */
 GArray *
-parse_output_fields(const char *                     fields_str,
+parse_output_fields(const char                      *fields_str,
                     const NMMetaAbstractInfo *const *fields_array,
                     gboolean                         parse_groups,
-                    GPtrArray **                     out_group_fields,
-                    GError **                        error)
+                    GPtrArray                      **out_group_fields,
+                    GError                         **error)
 {
     gs_free NMMetaSelectionResultList *selection = NULL;
-    GArray *                           array;
-    GPtrArray *                        group_fields = NULL;
+    GArray                            *array;
+    GPtrArray                         *group_fields = NULL;
     guint                              i;
 
     g_return_val_if_fail(!error || !*error, NULL);
@@ -926,7 +926,7 @@ nmc_empty_output_fields(NmcOutputData *output_data)
 typedef struct {
     guint               col_idx;
     const PrintDataCol *col;
-    const char *        title;
+    const char         *title;
     bool                title_to_free : 1;
 
     /* whether the column should be printed. If not %TRUE,
@@ -946,7 +946,7 @@ typedef struct {
     const PrintDataHeaderCell *header_cell;
     NMMetaColor                color;
     union {
-        const char *       plain;
+        const char        *plain;
         const char *const *strv;
     } text;
     PrintDataCellFormatType text_format : 3;
@@ -993,16 +993,16 @@ _print_data_cell_clear(gpointer cell_p)
 }
 
 static void
-_print_fill(const NmcConfig *   nmc_config,
-            gpointer const *    targets,
+_print_fill(const NmcConfig    *nmc_config,
+            gpointer const     *targets,
             gpointer            targets_data,
             const PrintDataCol *cols,
             guint               cols_len,
-            GArray **           out_header_row,
-            GArray **           out_cells)
+            GArray            **out_header_row,
+            GArray            **out_cells)
 {
-    GArray *               cells;
-    GArray *               header_row;
+    GArray                *cells;
+    GArray                *header_row;
     guint                  i_row, i_col;
     guint                  targets_len;
     NMMetaAccessorGetType  text_get_type;
@@ -1012,8 +1012,8 @@ _print_fill(const NmcConfig *   nmc_config,
     g_array_set_clear_func(header_row, _print_data_header_cell_clear);
 
     for (i_col = 0; i_col < cols_len; i_col++) {
-        const PrintDataCol *      col;
-        PrintDataHeaderCell *     header_cell;
+        const PrintDataCol       *col;
+        PrintDataHeaderCell      *header_cell;
         guint                     col_idx;
         const NMMetaAbstractInfo *info;
 
@@ -1064,9 +1064,9 @@ _print_fill(const NmcConfig *   nmc_config,
         PrintDataCell *cells_line = &g_array_index(cells, PrintDataCell, i_row * header_row->len);
 
         for (i_col = 0; i_col < header_row->len; i_col++) {
-            char *                    to_free = NULL;
-            PrintDataCell *           cell    = &cells_line[i_col];
-            PrintDataHeaderCell *     header_cell;
+            char                     *to_free = NULL;
+            PrintDataCell            *cell    = &cells_line[i_col];
+            PrintDataHeaderCell      *header_cell;
             const NMMetaAbstractInfo *info;
             NMMetaAccessorGetOutFlags text_out_flags, color_out_flags;
             gconstpointer             value;
@@ -1155,7 +1155,7 @@ _print_fill(const NmcConfig *   nmc_config,
             const PrintDataCell *cells_line =
                 &g_array_index(cells, PrintDataCell, i_row * header_row->len);
             const PrintDataCell *cell = &cells_line[i_col];
-            const char *const *  i_strv;
+            const char *const   *i_strv;
 
             switch (cell->text_format) {
             case PRINT_DATA_CELL_FORMAT_TYPE_PLAIN:
@@ -1185,7 +1185,7 @@ static gboolean
 _print_skip_column(const NmcConfig *nmc_config, const PrintDataHeaderCell *header_cell)
 {
     const NMMetaSelectionItem *selection_item;
-    const NMMetaAbstractInfo * info;
+    const NMMetaAbstractInfo  *info;
 
     selection_item = header_cell->col->selection_item;
     info           = selection_item->info;
@@ -1217,16 +1217,16 @@ _print_skip_column(const NmcConfig *nmc_config, const PrintDataHeaderCell *heade
 }
 
 static void
-_print_do(const NmcConfig *          nmc_config,
-          const char *               header_name_no_l10n,
+_print_do(const NmcConfig           *nmc_config,
+          const char                *header_name_no_l10n,
           guint                      col_len,
           guint                      row_len,
           const PrintDataHeaderCell *header_row,
-          const PrintDataCell *      cells)
+          const PrintDataCell       *cells)
 {
-    int                  width1, width2;
-    int                  table_width = 0;
-    guint                i_row, i_col;
+    int                           width1, width2;
+    int                           table_width = 0;
+    guint                         i_row, i_col;
     nm_auto_free_gstring GString *str = NULL;
 
     g_assert(col_len);
@@ -1235,7 +1235,7 @@ _print_do(const NmcConfig *          nmc_config,
     if (nmc_config->print_output == NMC_PRINT_PRETTY && header_name_no_l10n) {
         gs_free char *line = NULL;
         int           header_width;
-        const char *  header_name = _(header_name_no_l10n);
+        const char   *header_name = _(header_name_no_l10n);
 
         header_width = nmc_string_screen_width(header_name, NULL) + 4;
 
@@ -1261,7 +1261,7 @@ _print_do(const NmcConfig *          nmc_config,
         && !nmc_config->multiline_output) {
         for (i_col = 0; i_col < col_len; i_col++) {
             const PrintDataHeaderCell *header_cell = &header_row[i_col];
-            const char *               title;
+            const char                *title;
 
             if (_print_skip_column(nmc_config, header_cell))
                 continue;
@@ -1297,7 +1297,7 @@ _print_do(const NmcConfig *          nmc_config,
 
         for (i_col = 0; i_col < col_len; i_col++) {
             const PrintDataCell *cell  = &current_line[i_col];
-            const char *const *  lines = NULL;
+            const char *const   *lines = NULL;
             guint                i_lines, lines_len;
 
             if (_print_skip_column(nmc_config, cell->header_cell))
@@ -1318,7 +1318,7 @@ _print_do(const NmcConfig *          nmc_config,
 
             for (i_lines = 0; i_lines < lines_len; i_lines++) {
                 gs_free char *text_to_free = NULL;
-                const char *  text;
+                const char   *text;
 
                 text = colorize_string(nmc_config, cell->color, lines[i_lines], &text_to_free);
                 if (nmc_config->multiline_output) {
@@ -1385,19 +1385,19 @@ _print_do(const NmcConfig *          nmc_config,
 }
 
 gboolean
-nmc_print(const NmcConfig *                nmc_config,
-          gpointer const *                 targets,
+nmc_print(const NmcConfig                 *nmc_config,
+          gpointer const                  *targets,
           gpointer                         targets_data,
-          const char *                     header_name_no_l10n,
+          const char                      *header_name_no_l10n,
           const NMMetaAbstractInfo *const *fields,
-          const char *                     fields_str,
-          GError **                        error)
+          const char                      *fields_str,
+          GError                         **error)
 {
     gs_unref_ptrarray GPtrArray *gfree_keeper = NULL;
-    gs_free PrintDataCol *cols_data           = NULL;
-    guint                 cols_len;
-    gs_unref_array GArray *header_row = NULL;
-    gs_unref_array GArray *cells      = NULL;
+    gs_free PrintDataCol        *cols_data    = NULL;
+    guint                        cols_len;
+    gs_unref_array GArray       *header_row = NULL;
+    gs_unref_array GArray       *cells      = NULL;
 
     if (!_output_selection_parse(fields, fields_str, &cols_data, &cols_len, &gfree_keeper, error))
         return FALSE;
@@ -1528,15 +1528,15 @@ nmc_terminal_spawn_pager(const NmcConfig *nmc_config)
 /*****************************************************************************/
 
 static const char *
-get_value_to_print(const NmcConfig *     nmc_config,
+get_value_to_print(const NmcConfig      *nmc_config,
                    const NmcOutputField *field,
                    gboolean              field_name,
-                   const char *          not_set_str,
-                   char **               out_to_free)
+                   const char           *not_set_str,
+                   char                **out_to_free)
 {
     gboolean      is_array = field->value_is_array;
-    const char *  value;
-    const char *  out;
+    const char   *value;
+    const char   *out;
     gs_free char *free_value = NULL;
 
     nm_assert(out_to_free && !*out_to_free);
@@ -1569,18 +1569,18 @@ get_value_to_print(const NmcConfig *     nmc_config,
  * of 'field_values' array.
  */
 void
-print_required_fields(const NmcConfig *     nmc_config,
-                      NmcPagerData *        pager_data,
+print_required_fields(const NmcConfig      *nmc_config,
+                      NmcPagerData         *pager_data,
                       NmcOfFlags            of_flags,
-                      const GArray *        indices,
-                      const char *          header_name,
+                      const GArray         *indices,
+                      const char           *header_name,
                       int                   indent,
                       const NmcOutputField *field_values)
 {
     nm_auto_free_gstring GString *str = NULL;
     int                           width1, width2;
     int                           table_width = 0;
-    const char *                  not_set_str;
+    const char                   *not_set_str;
     int                           i;
     gboolean                      main_header_add  = of_flags & NMC_OF_FLAG_MAIN_HEADER_ADD;
     gboolean                      main_header_only = of_flags & NMC_OF_FLAG_MAIN_HEADER_ONLY;
@@ -1635,7 +1635,7 @@ print_required_fields(const NmcConfig *     nmc_config,
 
             if (is_array) {
                 gs_free char *val_to_free = NULL;
-                const char ** p, *val, *print_val;
+                const char  **p, *val, *print_val;
                 int           j;
 
                 /* value is a null-terminated string array */
@@ -1664,9 +1664,9 @@ print_required_fields(const NmcConfig *     nmc_config,
             } else {
                 gs_free char *val_to_free = NULL;
                 gs_free char *tmp         = NULL;
-                const char *  hdr_name    = (const char *) field_values[0].value;
-                const char *  val         = (const char *) field_values[idx].value;
-                const char *  print_val;
+                const char   *hdr_name    = (const char *) field_values[0].value;
+                const char   *val         = (const char *) field_values[idx].value;
+                const char   *print_val;
 
                 /* value is a string */
 
@@ -1703,7 +1703,7 @@ print_required_fields(const NmcConfig *     nmc_config,
     for (i = 0; i < indices->len; i++) {
         gs_free char *val_to_free = NULL;
         int           idx;
-        const char *  value;
+        const char   *value;
 
         idx = g_array_index(indices, int, i);
 
@@ -1782,7 +1782,7 @@ print_data_prepare_width(GPtrArray *output_data)
         for (j = 0; j < output_data->len; j++) {
             gboolean      field_names;
             gs_free char *val_to_free = NULL;
-            const char *  value;
+            const char   *value;
 
             row         = g_ptr_array_index(output_data, j);
             field_names = row[0].flags & NMC_OF_FLAG_FIELD_NAMES;
@@ -1798,10 +1798,10 @@ print_data_prepare_width(GPtrArray *output_data)
 }
 
 void
-print_data(const NmcConfig *    nmc_config,
-           NmcPagerData *       pager_data,
-           const GArray *       indices,
-           const char *         header_name,
+print_data(const NmcConfig     *nmc_config,
+           NmcPagerData        *pager_data,
+           const GArray        *indices,
+           const char          *header_name,
            int                  indent,
            const NmcOutputData *out)
 {
diff --git a/src/nmcli/utils.h b/src/nmcli/utils.h
index aadaab67..c6ead55b 100644
--- a/src/nmcli/utils.h
+++ b/src/nmcli/utils.h
@@ -11,7 +11,7 @@
 /* === Types === */
 
 typedef struct {
-    const char * name;
+    const char  *name;
     gboolean     has_value;
     const char **value;
     gboolean     mandatory;
@@ -22,16 +22,16 @@ typedef struct {
 int      next_arg(NmCli *nmc, int *argc, const char *const **argv, ...);
 gboolean nmc_arg_is_help(const char *arg);
 gboolean nmc_arg_is_option(const char *arg, const char *opt_name);
-gboolean nmc_parse_args(nmc_arg_t *         arg_arr,
+gboolean nmc_parse_args(nmc_arg_t          *arg_arr,
                         gboolean            last,
-                        int *               argc,
+                        int                *argc,
                         const char *const **argv,
-                        GError **           error);
-char *   ssid_to_hex(const char *str, gsize len);
+                        GError            **error);
+char    *ssid_to_hex(const char *str, gsize len);
 void     nmc_terminal_erase_line(void);
 void     nmc_terminal_show_progress(const char *str);
 pid_t    nmc_terminal_spawn_pager(const NmcConfig *nmc_config);
-char *   nmc_colorize(const NmcConfig *nmc_config, NMMetaColor color, const char *fmt, ...)
+char    *nmc_colorize(const NmcConfig *nmc_config, NMMetaColor color, const char *fmt, ...)
     _nm_printf(3, 4);
 void  nmc_filter_out_colors_inplace(char *str);
 char *nmc_filter_out_colors(const char *str);
@@ -39,8 +39,8 @@ char *nmc_get_user_input(const char *ask_str);
 int   nmc_string_to_arg_array(const char *line,
                               const char *delim,
                               gboolean    unquote,
-                              char ***    argv,
-                              int *       argc);
+                              char     ***argv,
+                              int        *argc);
 char *nmc_util_strv_for_display(const char *const *strv, gboolean brackets);
 int   nmc_string_screen_width(const char *start, const char *end);
 void  set_val_str(NmcOutputField fields_array[], guint32 index, char *value);
@@ -50,25 +50,25 @@ void  set_val_arrc(NmcOutputField fields_array[], guint32 index, const char **va
 void  set_val_color_all(NmcOutputField fields_array[], NMMetaColor color);
 void  nmc_free_output_field_values(NmcOutputField fields_array[]);
 
-GArray *        parse_output_fields(const char *                     fields_str,
+GArray         *parse_output_fields(const char                      *fields_str,
                                     const NMMetaAbstractInfo *const *fields_array,
                                     gboolean                         parse_groups,
-                                    GPtrArray **                     group_fields,
-                                    GError **                        error);
+                                    GPtrArray                      **group_fields,
+                                    GError                         **error);
 NmcOutputField *nmc_dup_fields_array(const NMMetaAbstractInfo *const *fields, NmcOfFlags flags);
 void            nmc_empty_output_fields(NmcOutputData *output_data);
-void            print_required_fields(const NmcConfig *     nmc_config,
-                                      NmcPagerData *        pager_data,
+void            print_required_fields(const NmcConfig      *nmc_config,
+                                      NmcPagerData         *pager_data,
                                       NmcOfFlags            of_flags,
-                                      const GArray *        indices,
-                                      const char *          header_name,
+                                      const GArray         *indices,
+                                      const char           *header_name,
                                       int                   indent,
                                       const NmcOutputField *field_values);
 void            print_data_prepare_width(GPtrArray *output_data);
-void            print_data(const NmcConfig *    nmc_config,
-                           NmcPagerData *       pager_data,
-                           const GArray *       indices,
-                           const char *         header_name,
+void            print_data(const NmcConfig     *nmc_config,
+                           NmcPagerData        *pager_data,
+                           const GArray        *indices,
+                           const char          *header_name,
                            int                  indent,
                            const NmcOutputData *out);
 
@@ -251,8 +251,8 @@ struct _NmcMetaGenericInfo {
         const NMMetaType *meta_type;
     };
     NmcGenericInfoType               info_type;
-    const char *                     name;
-    const char *                     name_header;
+    const char                      *name;
+    const char                      *name_header;
     const NmcMetaGenericInfo *const *nested;
 
 #define NMC_META_GENERIC_INFO_GET_FCN_ARGS                                     \
@@ -327,7 +327,7 @@ typedef enum {
 static inline char *
 nmc_meta_generic_get_enum_with_detail(NmcMetaGenericGetEnumType get_enum_type,
                                       gint64                    enum_val,
-                                      const char *              str_val,
+                                      const char               *str_val,
                                       NMMetaAccessorGetType     get_type)
 {
     if (!NM_IN_SET(get_type, NM_META_ACCESSOR_GET_TYPE_PRETTY, NM_META_ACCESSOR_GET_TYPE_PARSABLE))
@@ -359,13 +359,13 @@ nmc_meta_generic_get_enum_with_detail(NmcMetaGenericGetEnumType get_enum_type,
 
 /*****************************************************************************/
 
-gboolean nmc_print(const NmcConfig *                nmc_config,
-                   gpointer const *                 targets,
+gboolean nmc_print(const NmcConfig                 *nmc_config,
+                   gpointer const                  *targets,
                    gpointer                         targets_data,
-                   const char *                     header_name_no_l10n,
+                   const char                      *header_name_no_l10n,
                    const NMMetaAbstractInfo *const *fields,
-                   const char *                     fields_str,
-                   GError **                        error);
+                   const char                      *fields_str,
+                   GError                         **error);
 
 /*****************************************************************************/