summary refs log tree commit diff
path: root/src/libnm-client-impl/nm-ip-config.c
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2022-02-14 19:23:28 +0100
committerMichael Biebl <biebl@debian.org>2022-02-14 19:23:28 +0100
commit2f94dba7385fd0e0ef19a06eb4a2fcf6c43d7946 (patch)
treee2222f5577115985dd52044d2991253403cdd952 /src/libnm-client-impl/nm-ip-config.c
parent88c227d90a6b7b388c5c85d72802a0ca8f05ed5c (diff)
New upstream version 1.35.91 upstream/1.35.91
Diffstat (limited to 'src/libnm-client-impl/nm-ip-config.c')
-rw-r--r--src/libnm-client-impl/nm-ip-config.c52
1 files changed, 26 insertions, 26 deletions
diff --git a/src/libnm-client-impl/nm-ip-config.c b/src/libnm-client-impl/nm-ip-config.c
index 5666888c..2307ce2c 100644
--- a/src/libnm-client-impl/nm-ip-config.c
+++ b/src/libnm-client-impl/nm-ip-config.c
@@ -31,11 +31,11 @@ NM_GOBJECT_PROPERTIES_DEFINE(NMIPConfig,
 typedef struct _NMIPConfigPrivate {
     GPtrArray *addresses;
     GPtrArray *routes;
-    char **    nameservers;
-    char **    domains;
-    char **    searches;
-    char **    wins_servers;
-    char *     gateway;
+    char     **nameservers;
+    char     **domains;
+    char     **searches;
+    char     **wins_servers;
+    char      *gateway;
 
     bool addresses_new_style : 1;
     bool routes_new_style : 1;
@@ -51,14 +51,14 @@ G_DEFINE_ABSTRACT_TYPE(NMIPConfig, nm_ip_config, NM_TYPE_OBJECT)
 /*****************************************************************************/
 
 static NMLDBusNotifyUpdatePropFlags
-_notify_update_prop_addresses(NMClient *              client,
-                              NMLDBusObject *         dbobj,
+_notify_update_prop_addresses(NMClient               *client,
+                              NMLDBusObject          *dbobj,
                               const NMLDBusMetaIface *meta_iface,
                               guint                   dbus_property_idx,
-                              GVariant *              value)
+                              GVariant               *value)
 {
-    NMIPConfig *       self                    = NM_IP_CONFIG(dbobj->nmobj);
-    NMIPConfigPrivate *priv                    = NM_IP_CONFIG_GET_PRIVATE(self);
+    NMIPConfig                  *self          = NM_IP_CONFIG(dbobj->nmobj);
+    NMIPConfigPrivate           *priv          = NM_IP_CONFIG_GET_PRIVATE(self);
     gs_unref_ptrarray GPtrArray *addresses_old = NULL;
     gs_unref_ptrarray GPtrArray *addresses_new = NULL;
     int      addr_family = meta_iface == &_nml_dbus_meta_iface_nm_ip4config ? AF_INET : AF_INET6;
@@ -91,14 +91,14 @@ _notify_update_prop_addresses(NMClient *              client,
 }
 
 static NMLDBusNotifyUpdatePropFlags
-_notify_update_prop_routes(NMClient *              client,
-                           NMLDBusObject *         dbobj,
+_notify_update_prop_routes(NMClient               *client,
+                           NMLDBusObject          *dbobj,
                            const NMLDBusMetaIface *meta_iface,
                            guint                   dbus_property_idx,
-                           GVariant *              value)
+                           GVariant               *value)
 {
-    NMIPConfig *       self                 = NM_IP_CONFIG(dbobj->nmobj);
-    NMIPConfigPrivate *priv                 = NM_IP_CONFIG_GET_PRIVATE(self);
+    NMIPConfig                  *self       = NM_IP_CONFIG(dbobj->nmobj);
+    NMIPConfigPrivate           *priv       = NM_IP_CONFIG_GET_PRIVATE(self);
     gs_unref_ptrarray GPtrArray *routes_old = NULL;
     gs_unref_ptrarray GPtrArray *routes_new = NULL;
     int      addr_family = meta_iface == &_nml_dbus_meta_iface_nm_ip4config ? AF_INET : AF_INET6;
@@ -131,13 +131,13 @@ _notify_update_prop_routes(NMClient *              client,
 }
 
 static NMLDBusNotifyUpdatePropFlags
-_notify_update_prop_nameservers(NMClient *              client,
-                                NMLDBusObject *         dbobj,
+_notify_update_prop_nameservers(NMClient               *client,
+                                NMLDBusObject          *dbobj,
                                 const NMLDBusMetaIface *meta_iface,
                                 guint                   dbus_property_idx,
-                                GVariant *              value)
+                                GVariant               *value)
 {
-    NMIPConfig *       self            = NM_IP_CONFIG(dbobj->nmobj);
+    NMIPConfig        *self            = NM_IP_CONFIG(dbobj->nmobj);
     NMIPConfigPrivate *priv            = NM_IP_CONFIG_GET_PRIVATE(self);
     gs_strfreev char **nameservers_new = NULL;
     gboolean           new_style       = TRUE;
@@ -160,14 +160,14 @@ _notify_update_prop_nameservers(NMClient *              client,
         else if (!new_style)
             nameservers_new = nm_utils_ip4_dns_from_variant(value);
         else {
-            GVariantIter      iter;
-            GVariantIter *    iter_v;
+            GVariantIter                 iter;
+            GVariantIter                *iter_v;
             gs_unref_ptrarray GPtrArray *arr = NULL;
 
             g_variant_iter_init(&iter, value);
             while (g_variant_iter_next(&iter, "a{sv}", &iter_v)) {
                 const char *key;
-                GVariant *  val;
+                GVariant   *val;
 
                 while (g_variant_iter_next(iter_v, "{&sv}", &key, &val)) {
                     if (nm_streq(key, "address")) {
@@ -203,13 +203,13 @@ next:
 }
 
 static NMLDBusNotifyUpdatePropFlags
-_notify_update_prop_wins_servers(NMClient *              client,
-                                 NMLDBusObject *         dbobj,
+_notify_update_prop_wins_servers(NMClient               *client,
+                                 NMLDBusObject          *dbobj,
                                  const NMLDBusMetaIface *meta_iface,
                                  guint                   dbus_property_idx,
-                                 GVariant *              value)
+                                 GVariant               *value)
 {
-    NMIPConfig *       self             = NM_IP_CONFIG(dbobj->nmobj);
+    NMIPConfig        *self             = NM_IP_CONFIG(dbobj->nmobj);
     NMIPConfigPrivate *priv             = NM_IP_CONFIG_GET_PRIVATE(self);
     gs_strfreev char **wins_servers_new = NULL;
     gboolean           new_style;