all: reformat all with new clang-format style

Run:

    ./contrib/scripts/nm-code-format.sh -i
    ./contrib/scripts/nm-code-format.sh -i

Yes, it needs to run twice because the first run doesn't yet produce the
final result.

Signed-off-by: Antonio Cardace <acardace@redhat.com>

1 files changed, 217 insertions, 241 deletions

diff --git a/shared/nm-glib-aux/nm-keyfile-aux.c b/shared/nm-glib-aux/nm-keyfile-aux.c
index 6504ac8e06..8d1a6678e4 100644
--- a/shared/nm-glib-aux/nm-keyfile-aux.c
+++ b/shared/nm-glib-aux/nm-keyfile-aux.c
@@ -16,119 +16,112 @@
 /*****************************************************************************/
 
 struct _NMKeyFileDB {
-	NMKeyFileDBLogFcn log_fcn;
-	NMKeyFileDBGotDirtyFcn got_dirty_fcn;
-	gpointer user_data;
-	const char *group_name;
-	GKeyFile *kf;
-	guint ref_count;
-
-	bool is_started:1;
-	bool dirty:1;
-	bool destroyed:1;
-
-	char filename[];
+    NMKeyFileDBLogFcn      log_fcn;
+    NMKeyFileDBGotDirtyFcn got_dirty_fcn;
+    gpointer               user_data;
+    const char *           group_name;
+    GKeyFile *             kf;
+    guint                  ref_count;
+
+    bool is_started : 1;
+    bool dirty : 1;
+    bool destroyed : 1;
+
+    char filename[];
 };
 
-#define _NMLOG(self, \
-               syslog_level, \
-               fmt, \
-               ...) \
-	G_STMT_START { \
-		NMKeyFileDB *_self = (self); \
-		\
-		nm_assert (_self); \
-		nm_assert (!_self->destroyed); \
-		\
-		if (_self->log_fcn) { \
-			_self->log_fcn (_self, \
-			                (syslog_level), \
-			                _self->user_data, \
-			                ""fmt"", \
-			                ##__VA_ARGS__); \
-		}; \
-	} G_STMT_END
-
-#define _LOGD(...) _NMLOG (self, LOG_DEBUG, __VA_ARGS__)
+#define _NMLOG(self, syslog_level, fmt, ...)                                                   \
+    G_STMT_START                                                                               \
+    {                                                                                          \
+        NMKeyFileDB *_self = (self);                                                           \
+                                                                                               \
+        nm_assert(_self);                                                                      \
+        nm_assert(!_self->destroyed);                                                          \
+                                                                                               \
+        if (_self->log_fcn) {                                                                  \
+            _self->log_fcn(_self, (syslog_level), _self->user_data, "" fmt "", ##__VA_ARGS__); \
+        };                                                                                     \
+    }                                                                                          \
+    G_STMT_END
+
+#define _LOGD(...) _NMLOG(self, LOG_DEBUG, __VA_ARGS__)
 
 static gboolean
-_IS_KEY_FILE_DB (NMKeyFileDB *self, gboolean require_is_started, gboolean allow_destroyed)
+_IS_KEY_FILE_DB(NMKeyFileDB *self, gboolean require_is_started, gboolean allow_destroyed)
 {
-	if (self == NULL)
-		return FALSE;
-	if (self->ref_count <= 0) {
-		nm_assert_not_reached ();
-		return FALSE;
-	}
-	if (   require_is_started
-	    && !self->is_started)
-		return FALSE;
-	if (   !allow_destroyed
-	    && self->destroyed)
-		return FALSE;
-	return TRUE;
+    if (self == NULL)
+        return FALSE;
+    if (self->ref_count <= 0) {
+        nm_assert_not_reached();
+        return FALSE;
+    }
+    if (require_is_started && !self->is_started)
+        return FALSE;
+    if (!allow_destroyed && self->destroyed)
+        return FALSE;
+    return TRUE;
 }
 
 /*****************************************************************************/
 
 NMKeyFileDB *
-nm_key_file_db_new (const char *filename,
-                    const char *group_name,
-                    NMKeyFileDBLogFcn log_fcn,
-                    NMKeyFileDBGotDirtyFcn got_dirty_fcn,
-                    gpointer user_data)
+nm_key_file_db_new(const char *           filename,
+                   const char *           group_name,
+                   NMKeyFileDBLogFcn      log_fcn,
+                   NMKeyFileDBGotDirtyFcn got_dirty_fcn,
+                   gpointer               user_data)
 {
-	NMKeyFileDB *self;
-	gsize l_filename;
-	gsize l_group;
-
-	g_return_val_if_fail (filename && filename[0], NULL);
-	g_return_val_if_fail (group_name && group_name[0], NULL);
-
-	l_filename = strlen (filename);
-	l_group = strlen (group_name);
-
-	self = g_malloc0 (sizeof (NMKeyFileDB) + l_filename + 1 + l_group + 1);
-	self->ref_count = 1;
-	self->log_fcn = log_fcn;
-	self->got_dirty_fcn = got_dirty_fcn;
-	self->user_data = user_data;
-	self->kf = g_key_file_new ();
-	g_key_file_set_list_separator (self->kf, ',');
-	memcpy (self->filename, filename, l_filename + 1);
-	self->group_name = &self->filename[l_filename + 1];
-	memcpy ((char *) self->group_name, group_name, l_group + 1);
-
-	return self;
+    NMKeyFileDB *self;
+    gsize        l_filename;
+    gsize        l_group;
+
+    g_return_val_if_fail(filename && filename[0], NULL);
+    g_return_val_if_fail(group_name && group_name[0], NULL);
+
+    l_filename = strlen(filename);
+    l_group    = strlen(group_name);
+
+    self                = g_malloc0(sizeof(NMKeyFileDB) + l_filename + 1 + l_group + 1);
+    self->ref_count     = 1;
+    self->log_fcn       = log_fcn;
+    self->got_dirty_fcn = got_dirty_fcn;
+    self->user_data     = user_data;
+    self->kf            = g_key_file_new();
+    g_key_file_set_list_separator(self->kf, ',');
+    memcpy(self->filename, filename, l_filename + 1);
+    self->group_name = &self->filename[l_filename + 1];
+    memcpy((char *) self->group_name, group_name, l_group + 1);
+
+    return self;
 }
 
 NMKeyFileDB *
-nm_key_file_db_ref (NMKeyFileDB *self)
+nm_key_file_db_ref(NMKeyFileDB *self)
 {
-	if (!self)
-		return NULL;
+    if (!self)
+        return NULL;
 
-	g_return_val_if_fail (_IS_KEY_FILE_DB (self, FALSE, TRUE), NULL);
+    g_return_val_if_fail(_IS_KEY_FILE_DB(self, FALSE, TRUE), NULL);
 
-	nm_assert (self->ref_count < G_MAXUINT);
-	self->ref_count++;
-	return self;
+    nm_assert(self->ref_count < G_MAXUINT);
+    self->ref_count++;
+    return self;
 }
 
 void
-nm_key_file_db_unref (NMKeyFileDB *self)
+nm_key_file_db_unref(NMKeyFileDB *self)
 {
-	if (!self)
-		return;
+    if (!self)
+        return;
 
-	g_return_if_fail (_IS_KEY_FILE_DB (self, FALSE, TRUE));
+    g_return_if_fail(_IS_KEY_FILE_DB(self, FALSE, TRUE));
 
-	if (--self->ref_count > 0)
-		return;
+    if (--self->ref_count > 0)
+        return;
 
-	g_key_file_unref (self->kf);
+    g_key_file_unref(self->kf);
 
-	g_free (self);
+    g_free(self);
 }
 
 /* destroy() is like unref, but it also makes the instance unusable.
@@ -148,16 +141,16 @@ nm_key_file_db_unref (NMKeyFileDB *self)
  * asserting at that point.
  */
 void
-nm_key_file_db_destroy (NMKeyFileDB *self)
+nm_key_file_db_destroy(NMKeyFileDB *self)
 {
-	if (!self)
-		return;
+    if (!self)
+        return;
 
-	g_return_if_fail (_IS_KEY_FILE_DB (self, FALSE, FALSE));
-	g_return_if_fail (!self->destroyed);
+    g_return_if_fail(_IS_KEY_FILE_DB(self, FALSE, FALSE));
+    g_return_if_fail(!self->destroyed);
 
-	self->destroyed = TRUE;
-	nm_key_file_db_unref (self);
+    self->destroyed = TRUE;
+    nm_key_file_db_unref(self);
 }
 
 /*****************************************************************************/
@@ -169,229 +162,212 @@ nm_key_file_db_destroy (NMKeyFileDB *self)
  * and the log_fcn returns the self pointer (which we should not expose before
  * nm_key_file_db_new() returns. */
 void
-nm_key_file_db_start (NMKeyFileDB *self)
+nm_key_file_db_start(NMKeyFileDB *self)
 {
-	gs_free char *contents = NULL;
-	gsize contents_len;
-	gs_free_error GError *error = NULL;
-
-	g_return_if_fail (_IS_KEY_FILE_DB (self, FALSE, FALSE));
-	g_return_if_fail (!self->is_started);
-
-	self->is_started = TRUE;
-
-	if (!nm_utils_file_get_contents (-1,
-	                                 self->filename,
-	                                 20*1024*1024,
-	                                 NM_UTILS_FILE_GET_CONTENTS_FLAG_NONE,
-	                                 &contents,
-	                                 &contents_len,
-	                                 NULL,
-	                                 &error)) {
-		_LOGD ("failed to read \"%s\": %s", self->filename, error->message);
-		return;
-	}
-
-	if (!g_key_file_load_from_data (self->kf,
-	                                contents,
-	                                contents_len,
-	                                G_KEY_FILE_KEEP_COMMENTS,
-	                                &error)) {
-		_LOGD ("failed to load keyfile \"%s\": %s", self->filename, error->message);
-		return;
-	}
-
-	_LOGD ("loaded keyfile-db for \"%s\"", self->filename);
+    gs_free char *contents = NULL;
+    gsize         contents_len;
+    gs_free_error GError *error = NULL;
+
+    g_return_if_fail(_IS_KEY_FILE_DB(self, FALSE, FALSE));
+    g_return_if_fail(!self->is_started);
+
+    self->is_started = TRUE;
+
+    if (!nm_utils_file_get_contents(-1,
+                                    self->filename,
+                                    20 * 1024 * 1024,
+                                    NM_UTILS_FILE_GET_CONTENTS_FLAG_NONE,
+                                    &contents,
+                                    &contents_len,
+                                    NULL,
+                                    &error)) {
+        _LOGD("failed to read \"%s\": %s", self->filename, error->message);
+        return;
+    }
+
+    if (!g_key_file_load_from_data(self->kf,
+                                   contents,
+                                   contents_len,
+                                   G_KEY_FILE_KEEP_COMMENTS,
+                                   &error)) {
+        _LOGD("failed to load keyfile \"%s\": %s", self->filename, error->message);
+        return;
+    }
+
+    _LOGD("loaded keyfile-db for \"%s\"", self->filename);
 }
 
 /*****************************************************************************/
 
 const char *
-nm_key_file_db_get_filename (NMKeyFileDB *self)
+nm_key_file_db_get_filename(NMKeyFileDB *self)
 {
-	g_return_val_if_fail (_IS_KEY_FILE_DB (self, FALSE, TRUE), NULL);
+    g_return_val_if_fail(_IS_KEY_FILE_DB(self, FALSE, TRUE), NULL);
 
-	return self->filename;
+    return self->filename;
 }
 
 gboolean
-nm_key_file_db_is_dirty (NMKeyFileDB *self)
+nm_key_file_db_is_dirty(NMKeyFileDB *self)
 {
-	g_return_val_if_fail (_IS_KEY_FILE_DB (self, FALSE, TRUE), FALSE);
+    g_return_val_if_fail(_IS_KEY_FILE_DB(self, FALSE, TRUE), FALSE);
 
-	return self->dirty;
+    return self->dirty;
 }
 
 /*****************************************************************************/
 
 char *
-nm_key_file_db_get_value (NMKeyFileDB *self,
-                          const char *key)
+nm_key_file_db_get_value(NMKeyFileDB *self, const char *key)
 {
-	g_return_val_if_fail (_IS_KEY_FILE_DB (self, TRUE, TRUE), NULL);
+    g_return_val_if_fail(_IS_KEY_FILE_DB(self, TRUE, TRUE), NULL);
 
-	return g_key_file_get_value (self->kf, self->group_name, key, NULL);
+    return g_key_file_get_value(self->kf, self->group_name, key, NULL);
 }
 
 char **
-nm_key_file_db_get_string_list (NMKeyFileDB *self,
-                                const char *key,
-                                gsize *out_len)
+nm_key_file_db_get_string_list(NMKeyFileDB *self, const char *key, gsize *out_len)
 {
-	g_return_val_if_fail (_IS_KEY_FILE_DB (self, TRUE, TRUE), NULL);
+    g_return_val_if_fail(_IS_KEY_FILE_DB(self, TRUE, TRUE), NULL);
 
-	return g_key_file_get_string_list (self->kf, self->group_name, key, out_len, NULL);
+    return g_key_file_get_string_list(self->kf, self->group_name, key, out_len, NULL);
 }
 
 /*****************************************************************************/
 
 static void
-_got_dirty (NMKeyFileDB *self,
-            const char *key)
+_got_dirty(NMKeyFileDB *self, const char *key)
 {
-	nm_assert (_IS_KEY_FILE_DB (self, TRUE, FALSE));
-	nm_assert (!self->dirty);
+    nm_assert(_IS_KEY_FILE_DB(self, TRUE, FALSE));
+    nm_assert(!self->dirty);
 
-	_LOGD ("updated entry for %s.%s", self->group_name, key);
+    _LOGD("updated entry for %s.%s", self->group_name, key);
 
-	self->dirty = TRUE;
-	if (self->got_dirty_fcn)
-		self->got_dirty_fcn (self, self->user_data);
+    self->dirty = TRUE;
+    if (self->got_dirty_fcn)
+        self->got_dirty_fcn(self, self->user_data);
 }
 
 /*****************************************************************************/
 
 void
-nm_key_file_db_remove_key (NMKeyFileDB *self,
-                           const char *key)
+nm_key_file_db_remove_key(NMKeyFileDB *self, const char *key)
 {
-	gboolean got_dirty = FALSE;
+    gboolean got_dirty = FALSE;
 
-	g_return_if_fail (_IS_KEY_FILE_DB (self, TRUE, FALSE));
+    g_return_if_fail(_IS_KEY_FILE_DB(self, TRUE, FALSE));
 
-	if (!key)
-		return;
+    if (!key)
+        return;
 
-	if (!self->dirty) {
-		gs_free_error GError *error = NULL;
+    if (!self->dirty) {
+        gs_free_error GError *error = NULL;
 
-		g_key_file_has_key (self->kf, self->group_name, key, &error);
-		got_dirty = (error != NULL);
-	}
-	g_key_file_remove_key (self->kf, self->group_name, key, NULL);
+        g_key_file_has_key(self->kf, self->group_name, key, &error);
+        got_dirty = (error != NULL);
+    }
+    g_key_file_remove_key(self->kf, self->group_name, key, NULL);
 
-	if (got_dirty)
-		_got_dirty (self, key);
+    if (got_dirty)
+        _got_dirty(self, key);
 }
 
 void
-nm_key_file_db_set_value (NMKeyFileDB *self,
-                          const char *key,
-                          const char *value)
+nm_key_file_db_set_value(NMKeyFileDB *self, const char *key, const char *value)
 {
-	gs_free char *old_value = NULL;
-	gboolean got_dirty = FALSE;
+    gs_free char *old_value = NULL;
+    gboolean      got_dirty = FALSE;
 
-	g_return_if_fail (_IS_KEY_FILE_DB (self, TRUE, FALSE));
-	g_return_if_fail (key);
+    g_return_if_fail(_IS_KEY_FILE_DB(self, TRUE, FALSE));
+    g_return_if_fail(key);
 
-	if (!value) {
-		nm_key_file_db_remove_key (self, key);
-		return;
-	}
+    if (!value) {
+        nm_key_file_db_remove_key(self, key);
+        return;
+    }
 
-	if (!self->dirty) {
-		gs_free_error GError *error = NULL;
+    if (!self->dirty) {
+        gs_free_error GError *error = NULL;
 
-		old_value = g_key_file_get_value (self->kf, self->group_name, key, &error);
-		if (error)
-			got_dirty = TRUE;
-	}
+        old_value = g_key_file_get_value(self->kf, self->group_name, key, &error);
+        if (error)
+            got_dirty = TRUE;
+    }
 
-	g_key_file_set_value (self->kf, self->group_name, key, value);
+    g_key_file_set_value(self->kf, self->group_name, key, value);
 
-	if (   !self->dirty
-	    && !got_dirty) {
-		gs_free_error GError *error = NULL;
-		gs_free char *new_value = NULL;
+    if (!self->dirty && !got_dirty) {
+        gs_free_error GError *error     = NULL;
+        gs_free char *        new_value = NULL;
 
-		new_value = g_key_file_get_value (self->kf, self->group_name, key, &error);
-		if (   error
-		    || !new_value
-		    || !nm_streq0 (old_value, new_value))
-			got_dirty = TRUE;
-	}
+        new_value = g_key_file_get_value(self->kf, self->group_name, key, &error);
+        if (error || !new_value || !nm_streq0(old_value, new_value))
+            got_dirty = TRUE;
+    }
 
-	if (got_dirty)
-		_got_dirty (self, key);
+    if (got_dirty)
+        _got_dirty(self, key);
 }
 
 void
-nm_key_file_db_set_string_list (NMKeyFileDB *self,
-                                const char *key,
-                                const char *const*value,
-                                gssize len)
+nm_key_file_db_set_string_list(NMKeyFileDB *      self,
+                               const char *       key,
+                               const char *const *value,
+                               gssize             len)
 {
-	gs_free char *old_value = NULL;
-	gboolean got_dirty = FALSE;
+    gs_free char *old_value = NULL;
+    gboolean      got_dirty = FALSE;
 
-	g_return_if_fail (_IS_KEY_FILE_DB (self, TRUE, FALSE));
-	g_return_if_fail (key);
+    g_return_if_fail(_IS_KEY_FILE_DB(self, TRUE, FALSE));
+    g_return_if_fail(key);
 
-	if (!value) {
-		nm_key_file_db_remove_key (self, key);
-		return;
-	}
+    if (!value) {
+        nm_key_file_db_remove_key(self, key);
+        return;
+    }
 
-	if (!self->dirty) {
-		gs_free_error GError *error = NULL;
+    if (!self->dirty) {
+        gs_free_error GError *error = NULL;
 
-		old_value = g_key_file_get_value (self->kf, self->group_name, key, &error);
-		if (error)
-			got_dirty = TRUE;
-	}
+        old_value = g_key_file_get_value(self->kf, self->group_name, key, &error);
+        if (error)
+            got_dirty = TRUE;
+    }
 
-	if (len < 0)
-		len = NM_PTRARRAY_LEN (value);
+    if (len < 0)
+        len = NM_PTRARRAY_LEN(value);
 
-	g_key_file_set_string_list (self->kf, self->group_name, key, value, len);
+    g_key_file_set_string_list(self->kf, self->group_name, key, value, len);
 
-	if (   !self->dirty
-	    && !got_dirty) {
-		gs_free_error GError *error = NULL;
-		gs_free char *new_value = NULL;
+    if (!self->dirty && !got_dirty) {
+        gs_free_error GError *error     = NULL;
+        gs_free char *        new_value = NULL;
 
-		new_value = g_key_file_get_value (self->kf, self->group_name, key, &error);
-		if (   error
-		    || !new_value
-		    || !nm_streq0 (old_value, new_value))
-			got_dirty = TRUE;
-	}
+        new_value = g_key_file_get_value(self->kf, self->group_name, key, &error);
+        if (error || !new_value || !nm_streq0(old_value, new_value))
+            got_dirty = TRUE;
+    }
 
-	if (got_dirty)
-		_got_dirty (self, key);
+    if (got_dirty)
+        _got_dirty(self, key);
 }
 
 /*****************************************************************************/
 
 void
-nm_key_file_db_to_file (NMKeyFileDB *self,
-                        gboolean force)
+nm_key_file_db_to_file(NMKeyFileDB *self, gboolean force)
 {
-	gs_free_error GError *error = NULL;
+    gs_free_error GError *error = NULL;
 
-	g_return_if_fail (_IS_KEY_FILE_DB (self, TRUE, FALSE));
+    g_return_if_fail(_IS_KEY_FILE_DB(self, TRUE, FALSE));
 
-	if (   !force
-	    && !self->dirty)
-		return;
+    if (!force && !self->dirty)
+        return;
 
-	self->dirty = FALSE;
+    self->dirty = FALSE;
 
-	if (!g_key_file_save_to_file (self->kf,
-	                              self->filename,
-	                              &error)) {
-		_LOGD ("failure to write keyfile \"%s\": %s", self->filename, error->message);
-	} else
-		_LOGD ("write keyfile: \"%s\"", self->filename);
+    if (!g_key_file_save_to_file(self->kf, self->filename, &error)) {
+        _LOGD("failure to write keyfile \"%s\": %s", self->filename, error->message);
+    } else
+        _LOGD("write keyfile: \"%s\"", self->filename);
 }