From 615b411122fed9700012b190aa86dffc58b03679 Mon Sep 17 00:00:00 2001
From: Matthias Klumpp <matthias@tenstral.net>
Date: Sun, 8 Dec 2024 23:17:57 +0100
Subject: [PATCH] trivial: autoformat

This is all just churn from clang-format updates... Slightly annoying.
---
 compose/asc-compose.c           |  11 ++--
 compose/asc-hint-tags.h         |   2 +-
 compose/asc-utils-fonts.c       |   6 +-
 compose/asc-utils-screenshots.c |  16 ++---
 qt/branding.cpp                 |  20 +++++--
 src/as-cache.c                  |   4 +-
 src/as-component.c              |   4 +-
 src/as-content-rating-private.h |  20 +++----
 src/as-content-rating.c         |  60 +++++++++----------
 src/as-desktop-entry.h          |  36 ++++++------
 src/as-macros.h                 |   2 +-
 src/as-news-convert.c           |   2 +-
 src/as-relation.c               | 100 ++++++++++++++++----------------
 src/as-release.c                |  10 ++--
 src/as-spdx.c                   |   4 +-
 src/as-system-info.c            |   4 +-
 src/as-tag.h                    |   4 +-
 src/as-utils.c                  |  21 ++++---
 src/as-validator.c              |  32 +++++-----
 src/as-yaml.h                   |   6 +-
 tests/test-compose.c            |  16 ++---
 tests/test-validate.c           |   2 +-
 tests/test-xmldata.c            |  48 +++++++--------
 tools/appstream-compose.c       |  10 ++--
 tools/appstreamcli.c            |  59 +++++++++----------
 tools/ascli-actions-mdata.c     |  26 ++++-----
 tools/ascli-actions-misc.c      |  22 +++----
 tools/ascli-actions-pkgmgr.c    |   9 ++-
 tools/ascli-actions-validate.c  |  28 ++++-----
 tools/ascli-utils.c             |   9 ++-
 30 files changed, 302 insertions(+), 291 deletions(-)

diff --git a/compose/asc-compose.c b/compose/asc-compose.c
index f9c5dfdd..cd04adad 100644
--- a/compose/asc-compose.c
+++ b/compose/asc-compose.c
@@ -1621,7 +1621,7 @@ asc_compose_process_task_cb (AscComposeTask *ctask, AscCompose *compose)
 				} /* end launch entry loop */
 			}
 		} /* end of desktop-entry support */
-	}	  /* end of metadata parsing loop */
+	} /* end of metadata parsing loop */
 
 	/* process the remaining .desktop files */
 	if (as_flags_contains (priv->flags, ASC_COMPOSE_FLAG_PROCESS_UNPAIRED_DESKTOP)) {
@@ -2182,10 +2182,11 @@ asc_compose_run (AscCompose *compose, GCancellable *cancellable, GError **error)
 
 	if (as_flags_contains (priv->flags, ASC_COMPOSE_FLAG_NO_PARTIAL_URLS) &&
 	    priv->media_baseurl == NULL) {
-		g_set_error_literal (error,
-				     ASC_COMPOSE_ERROR,
-				     ASC_COMPOSE_ERROR_FAILED,
-				     _("Partial URLs are not allowed, but no base URL is set to create full URLs."));
+		g_set_error_literal (
+		    error,
+		    ASC_COMPOSE_ERROR,
+		    ASC_COMPOSE_ERROR_FAILED,
+		    _("Partial URLs are not allowed, but no base URL is set to create full URLs."));
 		return NULL;
 	}
 
diff --git a/compose/asc-hint-tags.h b/compose/asc-hint-tags.h
index a4035792..ccd0380e 100644
--- a/compose/asc-hint-tags.h
+++ b/compose/asc-hint-tags.h
@@ -46,5 +46,5 @@ typedef struct {
 
 extern AscHintTagStatic asc_hint_tag_list[];
 
-#pragma GCC visibility	pop
+#pragma GCC visibility pop
 G_END_DECLS
diff --git a/compose/asc-utils-fonts.c b/compose/asc-utils-fonts.c
index d506d170..307ce60a 100644
--- a/compose/asc-utils-fonts.c
+++ b/compose/asc-utils-fonts.c
@@ -37,9 +37,9 @@ struct {
 	gint width;
 	gint height;
 } font_screenshot_sizes[] = {
-	{1024, 78},
-	{ 640, 48},
-	{ 0,   0 }
+	{ 1024, 78 },
+	{ 640,  48 },
+	{ 0,    0  }
 };
 
 /**
diff --git a/compose/asc-utils-screenshots.c b/compose/asc-utils-screenshots.c
index 569e3b78..372c2e27 100644
--- a/compose/asc-utils-screenshots.c
+++ b/compose/asc-utils-screenshots.c
@@ -41,11 +41,11 @@ struct {
 	gint width;
 	gint height;
 } target_screenshot_sizes[] = {
-	{1248, 702},
-	{ 752, 423},
-	{ 624, 351},
-	{ 224, 126},
-	{ 0,   0  }
+	{ 1248, 702 },
+	{ 752,  423 },
+	{ 624,  351 },
+	{ 224,  126 },
+	{ 0,    0   }
 };
 
 static AscVideoInfo *
@@ -713,9 +713,9 @@ asc_process_screenshot_images (AscResult *cres,
 	GHashTableIter ht_iter;
 	gpointer ht_key, ht_value;
 	g_autoptr(GHashTable) ht_lang_img = g_hash_table_new_full (g_str_hash,
-								    g_str_equal,
-								    g_free,
-								    g_object_unref);
+								   g_str_equal,
+								   g_free,
+								   g_object_unref);
 
 	imgs = as_screenshot_get_images_all (scr);
 	if (imgs->len == 0) {
diff --git a/qt/branding.cpp b/qt/branding.cpp
index e8a779fc..2b90efcd 100644
--- a/qt/branding.cpp
+++ b/qt/branding.cpp
@@ -99,20 +99,30 @@ QString Branding::colorSchemeToString(ColorSchemeKind colorScheme)
 
 Branding::ColorSchemeKind Branding::colorSchemefromString(const QString &string)
 {
-    return static_cast<Branding::ColorSchemeKind>(as_color_scheme_kind_from_string(qPrintable(string)));
+    return static_cast<Branding::ColorSchemeKind>(
+        as_color_scheme_kind_from_string(qPrintable(string)));
 }
 
-void Branding::setColor(Branding::ColorKind kind, Branding::ColorSchemeKind scheme, const QString &color)
+void Branding::setColor(Branding::ColorKind kind,
+                        Branding::ColorSchemeKind scheme,
+                        const QString &color)
 {
-    as_branding_set_color(d->brandingp, static_cast<AsColorKind>(kind), static_cast<AsColorSchemeKind>(scheme), qPrintable(color));
+    as_branding_set_color(d->brandingp,
+                          static_cast<AsColorKind>(kind),
+                          static_cast<AsColorSchemeKind>(scheme),
+                          qPrintable(color));
 }
 
 void Branding::removeColor(Branding::ColorKind kind, Branding::ColorSchemeKind scheme)
 {
-    as_branding_remove_color(d->brandingp, static_cast<AsColorKind>(kind), static_cast<AsColorSchemeKind>(scheme));
+    as_branding_remove_color(d->brandingp,
+                             static_cast<AsColorKind>(kind),
+                             static_cast<AsColorSchemeKind>(scheme));
 }
 
 QString Branding::color(Branding::ColorKind kind, Branding::ColorSchemeKind scheme)
 {
-    return valueWrap(as_branding_get_color(d->brandingp, static_cast<AsColorKind>(kind), static_cast<AsColorSchemeKind>(scheme)));
+    return valueWrap(as_branding_get_color(d->brandingp,
+                                           static_cast<AsColorKind>(kind),
+                                           static_cast<AsColorSchemeKind>(scheme)));
 }
diff --git a/src/as-cache.c b/src/as-cache.c
index c1808181..22e0ecfe 100644
--- a/src/as-cache.c
+++ b/src/as-cache.c
@@ -1968,8 +1968,8 @@ as_cache_search (AsCache *cache, const gchar *const *terms, gboolean sort, GErro
 		for (guint j = 0; queries[j].xpath != NULL; j++) {
 			g_autoptr(GError) error_query = NULL;
 			g_autoptr(XbQuery) query = xb_query_new (csec->silo,
-								  queries[j].xpath,
-								  &error_query);
+								 queries[j].xpath,
+								 &error_query);
 			if (query != NULL) {
 				AsFTSearchHelper *helper = g_new0 (AsFTSearchHelper, 1);
 				helper->match_value = queries[j].match_value;
diff --git a/src/as-component.c b/src/as-component.c
index fa7d10cf..561ed5e6 100644
--- a/src/as-component.c
+++ b/src/as-component.c
@@ -5190,7 +5190,7 @@ as_component_to_xml_node (AsComponent *cpt, AsContext *ctx, xmlNode *root)
 		for (guint i = 0; i < priv->tags->len; i++) {
 			xmlNode *tag_node = NULL;
 			g_auto(GStrv)
-				    parts = g_strsplit (g_ptr_array_index (priv->tags, i), "::", 2);
+				   parts = g_strsplit (g_ptr_array_index (priv->tags, i), "::", 2);
 			tag_node = as_xml_add_text_node (tags_node, "tag", parts[1]);
 			if (!as_is_empty (parts[0]))
 				as_xml_add_text_prop (tag_node, "namespace", parts[0]);
@@ -6412,7 +6412,7 @@ as_component_emit_yaml (AsComponent *cpt, AsContext *ctx, yaml_emitter_t *emitte
 
 		for (guint i = 0; i < priv->tags->len; i++) {
 			g_auto(GStrv)
-				    parts = g_strsplit (g_ptr_array_index (priv->tags, i), "::", 2);
+				   parts = g_strsplit (g_ptr_array_index (priv->tags, i), "::", 2);
 
 			as_yaml_mapping_start (emitter);
 			if (!as_is_empty (parts[0]))
diff --git a/src/as-content-rating-private.h b/src/as-content-rating-private.h
index d58b6391..62dc5e87 100644
--- a/src/as-content-rating-private.h
+++ b/src/as-content-rating-private.h
@@ -41,19 +41,19 @@ gboolean as_content_rating_load_from_xml (AsContentRating *content_rating,
 					  GError	 **error);
 void as_content_rating_to_xml_node (AsContentRating *content_rating, AsContext *ctx, xmlNode *root);
 
-gboolean	       as_content_rating_load_from_yaml (AsContentRating *content_rating,
-							 AsContext	 *ctx,
-							 GNode		 *node,
-							 GError		**error);
-void		       as_content_rating_emit_yaml (AsContentRating *content_rating,
-						    AsContext	    *ctx,
-						    yaml_emitter_t  *emitter);
+gboolean      as_content_rating_load_from_yaml (AsContentRating *content_rating,
+						AsContext	*ctx,
+						GNode		*node,
+						GError	       **error);
+void	      as_content_rating_emit_yaml (AsContentRating *content_rating,
+					   AsContext	   *ctx,
+					   yaml_emitter_t  *emitter);
 
-gboolean	       as_is_oars_key (const gchar *id, AsOarsVersion version);
+gboolean      as_is_oars_key (const gchar *id, AsOarsVersion version);
 
-AsOarsVersion	       as_oars_version_from_string (const gchar *value);
+AsOarsVersion as_oars_version_from_string (const gchar *value);
 
-gboolean	       as_content_rating_id_is_valid (const gchar *id, AsContentRatingValue value);
+gboolean      as_content_rating_id_is_valid (const gchar *id, AsContentRatingValue value);
 
 #pragma GCC visibility pop
 G_END_DECLS
diff --git a/src/as-content-rating.c b/src/as-content-rating.c
index 9f4a114e..88a704f0 100644
--- a/src/as-content-rating.c
+++ b/src/as-content-rating.c
@@ -481,7 +481,7 @@ static const gchar *content_rating_strings[AS_CONTENT_RATING_SYSTEM_LAST][7] = {
 	[AS_CONTENT_RATING_SYSTEM_RUSSIA] = { "0+", "6+", "12+", "16+", "18+", NULL },
 	[AS_CONTENT_RATING_SYSTEM_MDA] = { "General", "ADV", "M18", NULL },
 	[AS_CONTENT_RATING_SYSTEM_GRAC] = { "ALL", "12", "15", "18", NULL },
- /* Note: ESRB has locale-specific suffixes, so needs special further
+	/* Note: ESRB has locale-specific suffixes, so needs special further
 	 * handling in code. These strings are just the locale-independent parts. */
 	[AS_CONTENT_RATING_SYSTEM_ESRB] = { "Early Childhood",
 					    "Everyone", "Everyone 10+",
@@ -1204,35 +1204,35 @@ static const struct {
 	/* Each @id must only appear once. The set of @csm_age_* values for a
 	 * given @id must be complete and non-decreasing. */
 	/* v1.0 */
-	{"violence-cartoon",	      AS_OARS_VERSION_1_0, 0, 3,	 4,  6 },
-	{ "violence-fantasy",	      AS_OARS_VERSION_1_0, 0, 3,	 7,  8 },
-	{ "violence-realistic",	AS_OARS_VERSION_1_0, 0, 4,  9,  14},
-	{ "violence-bloodshed",	AS_OARS_VERSION_1_0, 0, 9,  11, 18},
-	{ "violence-sexual",	     AS_OARS_VERSION_1_0, 0, 18, 18, 18},
-	{ "drugs-alcohol",	   AS_OARS_VERSION_1_0, 0, 11, 13, 16},
-	{ "drugs-narcotics",	     AS_OARS_VERSION_1_0, 0, 12, 14, 17},
-	{ "drugs-tobacco",	   AS_OARS_VERSION_1_0, 0, 10, 13, 13},
-	{ "sex-nudity",		AS_OARS_VERSION_1_0, 0, 12, 14, 14},
-	{ "sex-themes",		AS_OARS_VERSION_1_0, 0, 13, 14, 15},
-	{ "language-profanity",	AS_OARS_VERSION_1_0, 0, 8,  11, 14},
-	{ "language-humor",	    AS_OARS_VERSION_1_0, 0, 3,  8,  14},
-	{ "language-discrimination", AS_OARS_VERSION_1_0, 0, 9,	10, 11},
-	{ "money-advertising",       AS_OARS_VERSION_1_0, 0, 7,  8,  10},
-	{ "money-gambling",	    AS_OARS_VERSION_1_0, 0, 7,  10, 18},
-	{ "money-purchasing",	      AS_OARS_VERSION_1_0, 0, 12, 14, 15},
-	{ "social-chat",		 AS_OARS_VERSION_1_0, 0, 4,  10, 13},
-	{ "social-audio",		  AS_OARS_VERSION_1_0, 0, 15, 15, 15},
-	{ "social-contacts",	     AS_OARS_VERSION_1_0, 0, 12, 12, 12},
-	{ "social-info",		 AS_OARS_VERSION_1_0, 0, 0,  13, 13},
-	{ "social-location",	     AS_OARS_VERSION_1_0, 0, 13, 13, 13},
- /* v1.1 additions */
-	{ "sex-homosexuality",       AS_OARS_VERSION_1_1, 0, 13, 14, 15},
-	{ "sex-prostitution",	      AS_OARS_VERSION_1_1, 0, 12, 14, 18},
-	{ "sex-adultery",		  AS_OARS_VERSION_1_1, 0, 8,  10, 18},
-	{ "sex-appearance",	    AS_OARS_VERSION_1_1, 0, 10, 10, 15},
-	{ "violence-worship",	      AS_OARS_VERSION_1_1, 0, 13, 15, 18},
-	{ "violence-desecration",	  AS_OARS_VERSION_1_1, 0, 13, 15, 18},
-	{ "violence-slavery",	      AS_OARS_VERSION_1_1, 0, 13, 15, 18},
+	{ "violence-cartoon",	      AS_OARS_VERSION_1_0, 0, 3,	 4,  6  },
+	{ "violence-fantasy",	      AS_OARS_VERSION_1_0, 0, 3,	 7,  8  },
+	{ "violence-realistic",	AS_OARS_VERSION_1_0, 0, 4,  9,  14 },
+	{ "violence-bloodshed",	AS_OARS_VERSION_1_0, 0, 9,  11, 18 },
+	{ "violence-sexual",	     AS_OARS_VERSION_1_0, 0, 18, 18, 18 },
+	{ "drugs-alcohol",	   AS_OARS_VERSION_1_0, 0, 11, 13, 16 },
+	{ "drugs-narcotics",	     AS_OARS_VERSION_1_0, 0, 12, 14, 17 },
+	{ "drugs-tobacco",	   AS_OARS_VERSION_1_0, 0, 10, 13, 13 },
+	{ "sex-nudity",		AS_OARS_VERSION_1_0, 0, 12, 14, 14 },
+	{ "sex-themes",		AS_OARS_VERSION_1_0, 0, 13, 14, 15 },
+	{ "language-profanity",	AS_OARS_VERSION_1_0, 0, 8,  11, 14 },
+	{ "language-humor",	    AS_OARS_VERSION_1_0, 0, 3,  8,  14 },
+	{ "language-discrimination", AS_OARS_VERSION_1_0, 0, 9,	10, 11 },
+	{ "money-advertising",       AS_OARS_VERSION_1_0, 0, 7,  8,  10 },
+	{ "money-gambling",	    AS_OARS_VERSION_1_0, 0, 7,  10, 18 },
+	{ "money-purchasing",	      AS_OARS_VERSION_1_0, 0, 12, 14, 15 },
+	{ "social-chat",		 AS_OARS_VERSION_1_0, 0, 4,  10, 13 },
+	{ "social-audio",		  AS_OARS_VERSION_1_0, 0, 15, 15, 15 },
+	{ "social-contacts",	     AS_OARS_VERSION_1_0, 0, 12, 12, 12 },
+	{ "social-info",		 AS_OARS_VERSION_1_0, 0, 0,  13, 13 },
+	{ "social-location",	     AS_OARS_VERSION_1_0, 0, 13, 13, 13 },
+	/* v1.1 additions */
+	{ "sex-homosexuality",       AS_OARS_VERSION_1_1, 0, 13, 14, 15 },
+	{ "sex-prostitution",	      AS_OARS_VERSION_1_1, 0, 12, 14, 18 },
+	{ "sex-adultery",		  AS_OARS_VERSION_1_1, 0, 8,  10, 18 },
+	{ "sex-appearance",	    AS_OARS_VERSION_1_1, 0, 10, 10, 15 },
+	{ "violence-worship",	      AS_OARS_VERSION_1_1, 0, 13, 15, 18 },
+	{ "violence-desecration",	  AS_OARS_VERSION_1_1, 0, 13, 15, 18 },
+	{ "violence-slavery",	      AS_OARS_VERSION_1_1, 0, 13, 15, 18 },
 };
 
 /**
diff --git a/src/as-desktop-entry.h b/src/as-desktop-entry.h
index 7b957317..4a5ca018 100644
--- a/src/as-desktop-entry.h
+++ b/src/as-desktop-entry.h
@@ -35,24 +35,24 @@ typedef GPtrArray *(*AsTranslateDesktopTextFn) (const GKeyFile *de,
 						gpointer	user_data);
 
 AS_INTERNAL_VISIBLE
-gboolean	       as_desktop_entry_parse_data (AsComponent		    *cpt,
-						    const gchar		    *data,
-						    gssize		     data_len,
-						    AsFormatVersion	     fversion,
-						    gboolean		     ignore_nodisplay,
-						    GPtrArray		    *issues,
-						    AsTranslateDesktopTextFn de_l10n_fn,
-						    gpointer		     user_data,
-						    GError		   **error);
-
-gboolean	       as_desktop_entry_parse_file (AsComponent		    *cpt,
-						    GFile		    *file,
-						    AsFormatVersion	     fversion,
-						    gboolean		     ignore_nodisplay,
-						    GPtrArray		    *issues,
-						    AsTranslateDesktopTextFn de_l10n_fn,
-						    gpointer		     user_data,
-						    GError		   **error);
+gboolean as_desktop_entry_parse_data (AsComponent	      *cpt,
+				      const gchar	      *data,
+				      gssize		       data_len,
+				      AsFormatVersion	       fversion,
+				      gboolean		       ignore_nodisplay,
+				      GPtrArray		      *issues,
+				      AsTranslateDesktopTextFn de_l10n_fn,
+				      gpointer		       user_data,
+				      GError		     **error);
+
+gboolean as_desktop_entry_parse_file (AsComponent	      *cpt,
+				      GFile		      *file,
+				      AsFormatVersion	       fversion,
+				      gboolean		       ignore_nodisplay,
+				      GPtrArray		      *issues,
+				      AsTranslateDesktopTextFn de_l10n_fn,
+				      gpointer		       user_data,
+				      GError		     **error);
 
 #pragma GCC visibility pop
 G_END_DECLS
diff --git a/src/as-macros.h b/src/as-macros.h
index ab018a0d..aea52c4b 100644
--- a/src/as-macros.h
+++ b/src/as-macros.h
@@ -44,7 +44,7 @@ G_BEGIN_DECLS
 	do {                            \
 		((bitfield) ^= flag);   \
 	} while (0)
-#define as_flags_contains(bitfield, flag) (((bitfield) &flag) > 0)
+#define as_flags_contains(bitfield, flag) (((bitfield) & flag) > 0)
 
 G_END_DECLS
 
diff --git a/src/as-news-convert.c b/src/as-news-convert.c
index b5344bc1..1417ece2 100644
--- a/src/as-news-convert.c
+++ b/src/as-news-convert.c
@@ -225,7 +225,7 @@ as_news_yaml_to_releases (const gchar *yaml_data, gint limit, GError **error)
 					} else {
 						/* we only have one list entry, or no list at all and a freeform text instead. Convert to paragraphs */
 						g_auto(GStrv)
-							    paras = g_strsplit (value, "\n\n", -1);
+							   paras = g_strsplit (value, "\n\n", -1);
 						for (guint i = 0; paras[i] != NULL; i++) {
 							g_auto(GStrv) lines = NULL;
 							gboolean in_listing = FALSE;
diff --git a/src/as-relation.c b/src/as-relation.c
index 4af31861..510f0572 100644
--- a/src/as-relation.c
+++ b/src/as-relation.c
@@ -1361,7 +1361,7 @@ _as_get_control_missing_message (AsControlKind c_kind, AsRelationKind r_kind)
 		if (ctl_name != NULL) {
 			/* TRANSLATORS: The placeholder is replaced with an input device name, e.g. "gamepad" */
 			return g_strdup_printf (_("This software requires a %s for input."),
-						   ctl_name);
+						  ctl_name);
 		}
 
 		if (c_kind == AS_CONTROL_KIND_TOUCH)
@@ -1377,7 +1377,7 @@ _as_get_control_missing_message (AsControlKind c_kind, AsRelationKind r_kind)
 		if (ctl_name != NULL) {
 			/* TRANSLATORS: The placeholder is replaced with an input device name, e.g. "gamepad" */
 			return g_strdup_printf (_("This software recommends a %s for input."),
-						   ctl_name);
+						  ctl_name);
 		}
 
 		if (c_kind == AS_CONTROL_KIND_TOUCH)
@@ -1385,11 +1385,9 @@ _as_get_control_missing_message (AsControlKind c_kind, AsRelationKind r_kind)
 		if (c_kind == AS_CONTROL_KIND_VOICE)
 			return g_strdup (_("This software recommends a microphone to be controlled via voice input."));
 		if (c_kind == AS_CONTROL_KIND_VISION)
-			return g_strdup (
-			    _("This software recommends a camera for input control."));
+			return g_strdup (_("This software recommends a camera for input control."));
 		if (c_kind == AS_CONTROL_KIND_CONSOLE)
-			return g_strdup (
-			    _("This software recommends a method for console input."));
+			return g_strdup (_("This software recommends a method for console input."));
 
 	} else if (r_kind == AS_RELATION_KIND_SUPPORTS) {
 
@@ -1509,7 +1507,7 @@ as_relation_is_satisfied (AsRelation *relation,
 			as_relation_check_result_set_message (
 			    rcres,
 			    _("Software '%s' was found"),
-			       as_component_get_name (as_component_box_index (cbox, 0)));
+			      as_component_get_name (as_component_box_index (cbox, 0)));
 
 			as_relation_check_result_set_status (rcres, AS_RELATION_STATUS_SATISFIED);
 			return g_steal_pointer (&rcres);
@@ -1559,7 +1557,7 @@ as_relation_is_satisfied (AsRelation *relation,
 			as_relation_check_result_set_message (
 			    rcres,
 			    _("Found hardware that is supported by this software: '%s'"),
-			       device_name);
+			      device_name);
 
 			as_relation_check_result_set_status (rcres, AS_RELATION_STATUS_SATISFIED);
 			return g_steal_pointer (&rcres);
@@ -1568,17 +1566,17 @@ as_relation_is_satisfied (AsRelation *relation,
 				as_relation_check_result_set_message (
 				    rcres,
 				    _("Required hardware for this software was not found on this system: '%s'"),
-				       device_name);
+				      device_name);
 			else if (priv->kind == AS_RELATION_KIND_RECOMMENDS)
 				as_relation_check_result_set_message (
 				    rcres,
 				    _("Recommended hardware for this software was not found on this system: '%s'"),
-				       device_name);
+				      device_name);
 			else
 				as_relation_check_result_set_message (
 				    rcres,
 				    _("This software supports hardware not present in this system: '%s'"),
-				       device_name);
+				      device_name);
 
 			as_relation_check_result_set_status (rcres,
 							     AS_RELATION_STATUS_NOT_SATISFIED);
@@ -1617,20 +1615,20 @@ as_relation_is_satisfied (AsRelation *relation,
 				as_relation_check_result_set_message (
 				    rcres,
 				    _("This software requires a %s kernel, but this system is running %s."),
-				       req_kernel_name,
-				       current_kernel_name);
+				      req_kernel_name,
+				      current_kernel_name);
 			else if (priv->kind == AS_RELATION_KIND_RECOMMENDS)
 				as_relation_check_result_set_message (
 				    rcres,
 				    _("This software recommends a %s kernel, but this system is running %s."),
-				       req_kernel_name,
-				       current_kernel_name);
+				      req_kernel_name,
+				      current_kernel_name);
 			else
 				as_relation_check_result_set_message (
 				    rcres,
 				    _("This software only supports a %s kernel, but may run on %s anyway."),
-				       req_kernel_name,
-				       current_kernel_name);
+				      req_kernel_name,
+				      current_kernel_name);
 
 			as_relation_check_result_set_status (rcres,
 							     AS_RELATION_STATUS_NOT_SATISFIED);
@@ -1659,11 +1657,11 @@ as_relation_is_satisfied (AsRelation *relation,
 				       second is comparison operator (e.g. >=), third is the expected version number fourth the current kernel name
 				       and fifth is the version we are running. */
 				    _("This software requires %s %s %s, but this system is running %s %s."),
-				       req_kernel_name,
-				       compare_symbols,
-				       req_kernel_version,
-				       current_kernel_name,
-				       current_kernel_version);
+				      req_kernel_name,
+				      compare_symbols,
+				      req_kernel_version,
+				      current_kernel_name,
+				      current_kernel_version);
 			else if (priv->kind == AS_RELATION_KIND_RECOMMENDS)
 				as_relation_check_result_set_message (
 				    rcres,
@@ -1671,20 +1669,20 @@ as_relation_is_satisfied (AsRelation *relation,
 				       second is comparison operator (e.g. >=), third is the expected version number fourth the current kernel name
 				       and fifth is the version we are running. */
 				    _("The use of %s %s %s is recommended, but this system is running %s %s."),
-				       req_kernel_name,
-				       compare_symbols,
-				       req_kernel_version,
-				       current_kernel_name,
-				       current_kernel_version);
+				      req_kernel_name,
+				      compare_symbols,
+				      req_kernel_version,
+				      current_kernel_name,
+				      current_kernel_version);
 			else if (priv->kind == AS_RELATION_KIND_SUPPORTS) {
 				as_relation_check_result_set_message (
 				    rcres,
 				    /* TRANSLATORS: We checked a kernel dependency, the first placeholder is the kernel name,
 				       second is comparison operator (e.g. >=), third is the expected version number. */
 				    _("This software supports %s %s %s."),
-				       req_kernel_name,
-				       compare_symbols,
-				       req_kernel_version);
+				      req_kernel_name,
+				      compare_symbols,
+				      req_kernel_version);
 				/* this is not an error, supports is only a hint for kernels */
 				as_relation_check_result_set_status (rcres,
 								     AS_RELATION_STATUS_SATISFIED);
@@ -1734,26 +1732,26 @@ as_relation_is_satisfied (AsRelation *relation,
 				    /* TRANSLATORS: We checked a memory dependency, the first placeholder is the comparison operator (e.g. >=),
 				       second is the expected amount of memory and fourth is the amount of memory we have. */
 				    _("This software requires %s %.2f GiB of memory, but this system has %.2f GiB."),
-				       compare_symbols,
-				       req_memory / 1024.0,
-				       current_memory / 1024.0);
+				      compare_symbols,
+				      req_memory / 1024.0,
+				      current_memory / 1024.0);
 			else if (priv->kind == AS_RELATION_KIND_RECOMMENDS)
 				as_relation_check_result_set_message (
 				    rcres,
 				    /* TRANSLATORS: We checked a memory dependency, the first placeholder is the comparison operator (e.g. >=),
 				       second is the expected amount of memory and fourth is the amount of memory we have. */
 				    _("This software recommends %s %.2f GiB of memory, but this system has %.2f GiB."),
-				       compare_symbols,
-				       req_memory / 1024.0,
-				       current_memory / 1024.0);
+				      compare_symbols,
+				      req_memory / 1024.0,
+				      current_memory / 1024.0);
 			else if (priv->kind == AS_RELATION_KIND_SUPPORTS) {
 				as_relation_check_result_set_message (
 				    rcres,
 				    /* TRANSLATORS: We checked a memory dependency, the first placeholder is the comparison operator (e.g. >=),
 				       second is the expected amount of memory. */
 				    _("This software supports %s %.2f GiB of memory."),
-				       compare_symbols,
-				       req_memory / 1024.0);
+				      compare_symbols,
+				      req_memory / 1024.0);
 				/* this is not an error, supports is only a hint for memory */
 				as_relation_check_result_set_status (rcres,
 								     AS_RELATION_STATUS_SATISFIED);
@@ -1860,18 +1858,18 @@ as_relation_is_satisfied (AsRelation *relation,
 					    /* TRANSLATORS: We checked a display size dependency, the first placeholder is the comparison operator (e.g. >=),
 					       second is the expected size and third is the size the current device has. */
 					    _("This software requires a display with its longest edge being %s %lu px in size, but the display of this device has %lu px."),
-					       compare_symbols,
-					       req_length,
-					       current_length);
+					      compare_symbols,
+					      req_length,
+					      current_length);
 				else
 					as_relation_check_result_set_message (
 					    rcres,
 					    /* TRANSLATORS: We checked a display size dependency, the first placeholder is the comparison operator (e.g. >=),
 					       second is the expected size and third is the size the current device has. */
 					    _("This software requires a display with its shortest edge being %s %lu px in size, but the display of this device has %lu px."),
-					       compare_symbols,
-					       req_length,
-					       current_length);
+					      compare_symbols,
+					      req_length,
+					      current_length);
 			} else if (priv->kind == AS_RELATION_KIND_RECOMMENDS) {
 				if (side_kind == AS_DISPLAY_SIDE_KIND_LONGEST)
 					as_relation_check_result_set_message (
@@ -1879,18 +1877,18 @@ as_relation_is_satisfied (AsRelation *relation,
 					    /* TRANSLATORS: We checked a display size dependency, the first placeholder is the comparison operator (e.g. >=),
 					       second is the expected size and third is the size the current device has. */
 					    _("This software recommends a display with its longest edge being %s %lu px in size, but the display of this device has %lu px."),
-					       compare_symbols,
-					       req_length,
-					       current_length);
+					      compare_symbols,
+					      req_length,
+					      current_length);
 				else
 					as_relation_check_result_set_message (
 					    rcres,
 					    /* TRANSLATORS: We checked a display size dependency, the first placeholder is the comparison operator (e.g. >=),
 					       second is the expected size and third is the size the current device has. */
 					    _("This software recommends a display with its shortest edge being %s %lu px in size, but the display of this device has %lu px."),
-					       compare_symbols,
-					       req_length,
-					       current_length);
+					      compare_symbols,
+					      req_length,
+					      current_length);
 			}
 			as_relation_check_result_set_status (rcres,
 							     AS_RELATION_STATUS_NOT_SATISFIED);
@@ -1917,7 +1915,7 @@ as_relation_is_satisfied (AsRelation *relation,
 	    AS_RELATION_ERROR,
 	    AS_RELATION_ERROR_NOT_IMPLEMENTED,
 	    _("Satisfiability check for relation items of type '%s' is not implemented yet."),
-	       as_relation_item_kind_to_string (priv->item_kind));
+	      as_relation_item_kind_to_string (priv->item_kind));
 
 	return NULL;
 }
diff --git a/src/as-release.c b/src/as-release.c
index 751e1b08..6bf84387 100644
--- a/src/as-release.c
+++ b/src/as-release.c
@@ -1031,8 +1031,7 @@ as_release_to_xml_node (AsRelease *release, AsContext *ctx, xmlNode *root)
 			time_str = g_strdup_printf ("%" G_GUINT64_FORMAT, priv->timestamp);
 			as_xml_add_text_prop (subnode, "timestamp", time_str);
 		} else {
-			g_autoptr(GDateTime)
-				       time = g_date_time_new_from_unix_utc (priv->timestamp);
+			g_autoptr(GDateTime) time = g_date_time_new_from_unix_utc (priv->timestamp);
 			time_str = g_date_time_format_iso8601 (time);
 			as_xml_add_text_prop (subnode, "date", time_str);
 		}
@@ -1080,7 +1079,7 @@ as_release_to_xml_node (AsRelease *release, AsContext *ctx, xmlNode *root)
 		for (guint i = 0; i < priv->tags->len; i++) {
 			xmlNode *tag_node = NULL;
 			g_auto(GStrv)
-				    parts = g_strsplit (g_ptr_array_index (priv->tags, i), "::", 2);
+				   parts = g_strsplit (g_ptr_array_index (priv->tags, i), "::", 2);
 			tag_node = as_xml_add_text_node (tags_node, "tag", parts[1]);
 			if (!as_is_empty (parts[0]))
 				as_xml_add_text_prop (tag_node, "namespace", parts[0]);
@@ -1211,8 +1210,7 @@ as_release_emit_yaml (AsRelease *release, AsContext *ctx, yaml_emitter_t *emitte
 		if (as_context_get_style (ctx) == AS_FORMAT_STYLE_CATALOG) {
 			as_yaml_emit_entry_timestamp (emitter, "unix-timestamp", priv->timestamp);
 		} else {
-			g_autoptr(GDateTime)
-				       time = g_date_time_new_from_unix_utc (priv->timestamp);
+			g_autoptr(GDateTime) time = g_date_time_new_from_unix_utc (priv->timestamp);
 			time_str = g_date_time_format_iso8601 (time);
 			as_yaml_emit_entry (emitter, "date", time_str);
 		}
@@ -1274,7 +1272,7 @@ as_release_emit_yaml (AsRelease *release, AsContext *ctx, yaml_emitter_t *emitte
 
 		for (guint i = 0; i < priv->tags->len; i++) {
 			g_auto(GStrv)
-				    parts = g_strsplit (g_ptr_array_index (priv->tags, i), "::", 2);
+				   parts = g_strsplit (g_ptr_array_index (priv->tags, i), "::", 2);
 
 			as_yaml_mapping_start (emitter);
 			if (!as_is_empty (parts[0]))
diff --git a/src/as-spdx.c b/src/as-spdx.c
index 80af8065..26129ce0 100644
--- a/src/as-spdx.c
+++ b/src/as-spdx.c
@@ -63,13 +63,13 @@ as_spdx_license_tokenize_drop (AsSpdxHelper *helper)
 		const gchar *old;
 		const gchar *new;
 	} licenses[] = {
-		{"CC0",		 "CC0-1.0"		   },
+		{ "CC0",	 "CC0-1.0"		   },
 		{ "CC-BY",	   "CC-BY-3.0"	       },
 		{ "CC-BY-SA",    "CC-BY-SA-3.0"	     },
 		{ "GFDL",	  "GFDL-1.3"		     },
 		{ "GPL-2",	   "GPL-2.0"		     },
 		{ "GPL-3",	   "GPL-3.0"		     },
-		{ "proprietary", "LicenseRef-proprietary"},
+		{ "proprietary", "LicenseRef-proprietary" },
 		{ NULL,		NULL		     }
 	};
 
diff --git a/src/as-system-info.c b/src/as-system-info.c
index d5afb752..0c7e27cd 100644
--- a/src/as-system-info.c
+++ b/src/as-system-info.c
@@ -514,8 +514,8 @@ as_get_physical_memory_total (void)
 	}
 	return hbi.memory_size / MB_IN_BYTES;
 #elif defined(__sun)
-	long physpages = sysconf(_SC_PHYS_PAGES);
-	long pagesize = sysconf(_SC_PAGESIZE);
+	long physpages = sysconf (_SC_PHYS_PAGES);
+	long pagesize = sysconf (_SC_PAGESIZE);
 	if (physpages > 0 && pagesize > 0)
 		return (physpages * pagesize) / MB_IN_BYTES;
 	return 0;
diff --git a/src/as-tag.h b/src/as-tag.h
index 2b85110c..a6d6244f 100644
--- a/src/as-tag.h
+++ b/src/as-tag.h
@@ -139,9 +139,9 @@ typedef enum {
 	AS_TAG_LAST
 } AsTag;
 
-AsTag		       as_xml_tag_from_string (const gchar *tag);
+AsTag as_xml_tag_from_string (const gchar *tag);
 
-AsTag		       as_yaml_tag_from_string (const gchar *tag);
+AsTag as_yaml_tag_from_string (const gchar *tag);
 
 #pragma GCC visibility pop
 G_END_DECLS
diff --git a/src/as-utils.c b/src/as-utils.c
index 4def1dce..d67c4f1d 100644
--- a/src/as-utils.c
+++ b/src/as-utils.c
@@ -2639,7 +2639,8 @@ as_utils_install_metadata_file (AsMetadataLocation location,
 			}
 
 			if (icons_size_id == NULL) {
-				g_warning ("Unable to find valid icon size in icon tarball name, assuming 64x64px.");
+				g_warning ("Unable to find valid icon size in icon tarball name, "
+					   "assuming 64x64px.");
 				icons_size_id = "64x64";
 			}
 
@@ -2783,23 +2784,25 @@ as_utils_find_stock_icon_filename_full (const gchar *root_dir,
 					GError **error)
 {
 	guint min_size_idx = 0;
+	/* clang-format off */
 	const gchar *supported_ext[] = { ".png", ".svg", ".svgz", "", NULL };
 	const struct {
 		guint size;
 		const gchar *size_str;
 	} sizes[] = {
-		{48,   "48x48"   },
-		    { 64,  "64x64"	  },
-		{ 96,  "96x96"   },
-		   { 128, "128x128" },
-		{ 256, "256x256" },
-		    { 512, "512x512" },
-		{ 0,   "scalable"},
-		   { 0,	NULL	     }
+		{ 48,  "48x48"    },
+		{ 64,  "64x64"	  },
+		{ 96,  "96x96"    },
+		{ 128, "128x128"  },
+		{ 256, "256x256"  },
+		{ 512, "512x512"  },
+		{ 0,   "scalable" },
+		{ 0,	NULL	  }
 	};
 	const gchar *types[] = { "actions", "animations", "apps",	 "categories", "devices",
 				 "emblems", "emotes",	  "filesystems", "intl",       "mimetypes",
 				 "places",  "status",	  "stock",	 NULL };
+	/* clang-format on */
 	g_autofree gchar *prefix = NULL;
 
 	g_return_val_if_fail (icon_name != NULL, NULL);
diff --git a/src/as-validator.c b/src/as-validator.c
index 49775095..2576b149 100644
--- a/src/as-validator.c
+++ b/src/as-validator.c
@@ -478,7 +478,7 @@ as_validator_add_release_bytes (AsValidator *validator,
 			     AS_VALIDATOR_ERROR,
 			     AS_VALIDATOR_ERROR_INVALID_FILENAME,
 			     _("The release metadata file '%s' is named incorrectly."),
-				release_fname);
+			       release_fname);
 		return FALSE;
 	}
 	if (g_strstr_len (release_fname, -1, "/") != NULL) {
@@ -709,7 +709,7 @@ as_validator_add_override (AsValidator *validator,
 				    /* TRANSLATORS: The user tried to override an issue tag and make it non-fatal, even though the tag is not
 						   whitelisted for that. */
 				    _("It is not allowed to downgrade the severity of tag '%s' to one that allows validation to pass."),
-				       tag);
+				      tag);
 				return FALSE;
 			}
 		}
@@ -1657,9 +1657,7 @@ as_validator_check_screenshots (AsValidator *validator, xmlNode *node, AsCompone
 			    iter,
 			    "invalid-child-tag-name",
 			    /* TRANSLATORS: An invalid XML element was found, "Found" refers to the tag name found, "Allowed" to the permitted name. */
-			    _("Found: %s - Allowed: %s"),
-			       (const gchar *) iter->name,
-			       "screenshot");
+			    _("Found: %s - Allowed: %s"), (const gchar *) iter->name, "screenshot");
 		}
 
 		for (iter2 = iter->children; iter2 != NULL; iter2 = iter2->next) {
@@ -1881,8 +1879,8 @@ as_validator_check_screenshots (AsValidator *validator, xmlNode *node, AsCompone
 				    "invalid-child-tag-name",
 				    /* TRANSLATORS: An invalid XML element was found, "Found" refers to the tag name found, "Allowed" to the permitted name. */
 				    _("Found: %s - Allowed: %s"),
-				       (const gchar *) iter2->name,
-				       "caption; image; video");
+				      (const gchar *) iter2->name,
+				      "caption; image; video");
 			}
 		}
 
@@ -2454,9 +2452,15 @@ as_validator_check_release (AsValidator *validator, xmlNode *node, AsFormatStyle
 		if (timestamp == NULL) {
 			/* Neither timestamp, nor date property exists */
 			if (rel_kind == AS_RELEASE_KIND_SNAPSHOT)
-				as_validator_add_issue (validator, node, "release-time-missing-for-snapshot", "date");
+				as_validator_add_issue (validator,
+							node,
+							"release-time-missing-for-snapshot",
+							"date");
 			else
-				as_validator_add_issue (validator, node, "release-time-missing", "date");
+				as_validator_add_issue (validator,
+							node,
+							"release-time-missing",
+							"date");
 		} else {
 			/* check if the timestamp is both a number and higher than 3000. The 3000 is used to check that it is not a year */
 			if (!as_str_verify_integer (timestamp, 3000, G_MAXINT64))
@@ -2530,8 +2534,8 @@ as_validator_check_release (AsValidator *validator, xmlNode *node, AsFormatStyle
 					    "invalid-child-tag-name",
 					    /* TRANSLATORS: An invalid XML element was found, "Found" refers to the tag name found, "Allowed" to the permitted name. */
 					    _("Found: %s - Allowed: %s"),
-					       (const gchar *) iter2->name,
-					       "artifact");
+					      (const gchar *) iter2->name,
+					      "artifact");
 					continue;
 				}
 				/* validate artifact */
@@ -2552,8 +2556,8 @@ as_validator_check_release (AsValidator *validator, xmlNode *node, AsFormatStyle
 					    "invalid-child-tag-name",
 					    /* TRANSLATORS: An invalid XML element was found, "Found" refers to the tag name found, "Allowed" to the permitted name. */
 					    _("Found: %s - Allowed: %s"),
-					       (const gchar *) iter2->name,
-					       "issue");
+					      (const gchar *) iter2->name,
+					      "issue");
 					continue;
 				}
 				/* validate issue */
@@ -2820,7 +2824,7 @@ as_validator_check_content_rating (AsValidator *validator, xmlNode *node)
 	AsOarsVersion oars_version;
 
 	g_autoptr(GHashTable)
-		       known_ids = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
+		      known_ids = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
 
 	oars_type = as_xml_get_prop_value (node, "type");
 
diff --git a/src/as-yaml.h b/src/as-yaml.h
index a68a8551..56c0ee75 100644
--- a/src/as-yaml.h
+++ b/src/as-yaml.h
@@ -66,9 +66,9 @@ void as_yaml_emit_entry_timestamp (yaml_emitter_t *emitter, const gchar *key, gu
 void as_yaml_emit_long_entry (yaml_emitter_t *emitter, const gchar *key, const gchar *value);
 void as_yaml_emit_sequence (yaml_emitter_t *emitter, const gchar *key, GPtrArray *list);
 #pragma GCC visibility pop
-void		       as_yaml_emit_sequence_from_str_array (yaml_emitter_t *emitter,
-							     const gchar    *key,
-							     GPtrArray	    *array);
+void as_yaml_emit_sequence_from_str_array (yaml_emitter_t *emitter,
+					   const gchar	  *key,
+					   GPtrArray	  *array);
 void as_yaml_emit_localized_strv (yaml_emitter_t *emitter, const gchar *key, GHashTable *ltab);
 void as_yaml_emit_localized_str_array (yaml_emitter_t *emitter, const gchar *key, GHashTable *ltab);
 
diff --git a/tests/test-compose.c b/tests/test-compose.c
index fb2ca8ee..64b80fd7 100644
--- a/tests/test-compose.c
+++ b/tests/test-compose.c
@@ -513,14 +513,14 @@ test_compose_desktop_entry (void)
 	gchar *tmp;
 	AsLaunchable *launch;
 	GPtrArray *hints;
-	g_autoptr(GBytes) de_bytes = as_gbytes_from_literal (
-	    "[Desktop Entry]\n"
-	    "Type=Application\n"
-	    "Name=FooBar\n"
-	    "Name[de_DE]=FööBär\n"
-	    "Comment=A foo-ish bar.\n"
-	    "Keywords=Hobbes;Bentham;Locke;\n"
-	    "Keywords[de_DE]=Heidegger;Kant;Hegel;\n");
+	g_autoptr(GBytes)
+		      de_bytes = as_gbytes_from_literal ("[Desktop Entry]\n"
+							 "Type=Application\n"
+							 "Name=FooBar\n"
+							 "Name[de_DE]=FööBär\n"
+							 "Comment=A foo-ish bar.\n"
+							 "Keywords=Hobbes;Bentham;Locke;\n"
+							 "Keywords[de_DE]=Heidegger;Kant;Hegel;\n");
 
 	cres = asc_result_new ();
 
diff --git a/tests/test-validate.c b/tests/test-validate.c
index dc24b145..22774e9e 100644
--- a/tests/test-validate.c
+++ b/tests/test-validate.c
@@ -77,7 +77,7 @@ static void
 _astest_check_validate_issues (GList *issues, AsVResultCheck *checks_all)
 {
 	g_autoptr(GHashTable)
-		       checks = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
+		      checks = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
 
 	for (guint i = 0; checks_all[i].tag != NULL; i++)
 		g_hash_table_insert (checks,
diff --git a/tests/test-xmldata.c b/tests/test-xmldata.c
index 0db906a4..a2d45276 100644
--- a/tests/test-xmldata.c
+++ b/tests/test-xmldata.c
@@ -1439,39 +1439,39 @@ test_xml_read_screenshots (void)
 	screenshots = as_component_get_screenshots_all (cpt);
 	as_component_set_context_locale (cpt, "C");
 	_assert_screenshot_captions_order (screenshots,
-					   (const gchar *[]){ "The main window displaying a thing",
-							      "Second screenshot",
-							      "Screencast",
-							      "The app, on mobile!",
-							      "The app, on KDE Plasma desktop!",
-							      NULL });
+					   (const gchar *[]) { "The main window displaying a thing",
+							       "Second screenshot",
+							       "Screencast",
+							       "The app, on mobile!",
+							       "The app, on KDE Plasma desktop!",
+							       NULL });
 
 	as_component_sort_screenshots (cpt, "plasma", "mobile", FALSE);
 	_assert_screenshot_captions_order (screenshots,
-					   (const gchar *[]){ "The app, on mobile!",
-							      "The app, on KDE Plasma desktop!",
-							      "The main window displaying a thing",
-							      "Second screenshot",
-							      "Screencast",
-							      NULL });
+					   (const gchar *[]) { "The app, on mobile!",
+							       "The app, on KDE Plasma desktop!",
+							       "The main window displaying a thing",
+							       "Second screenshot",
+							       "Screencast",
+							       NULL });
 
 	as_component_sort_screenshots (cpt, "plasma", NULL, FALSE);
 	_assert_screenshot_captions_order (screenshots,
-					   (const gchar *[]){ "The app, on KDE Plasma desktop!",
-							      "The app, on mobile!",
-							      "The main window displaying a thing",
-							      "Second screenshot",
-							      "Screencast",
-							      NULL });
+					   (const gchar *[]) { "The app, on KDE Plasma desktop!",
+							       "The app, on mobile!",
+							       "The main window displaying a thing",
+							       "Second screenshot",
+							       "Screencast",
+							       NULL });
 
 	as_component_sort_screenshots (cpt, "gnome", NULL, FALSE);
 	_assert_screenshot_captions_order (screenshots,
-					   (const gchar *[]){ "The main window displaying a thing",
-							      "Second screenshot",
-							      "Screencast",
-							      "The app, on mobile!",
-							      "The app, on KDE Plasma desktop!",
-							      NULL });
+					   (const gchar *[]) { "The main window displaying a thing",
+							       "Second screenshot",
+							       "Screencast",
+							       "The app, on mobile!",
+							       "The app, on KDE Plasma desktop!",
+							       NULL });
 
 	/* test a legacy screenshot entry that we briefly supported in an older AppStream release */
 	g_object_unref (cpt);
diff --git a/tools/appstream-compose.c b/tools/appstream-compose.c
index 438bc729..b73d939f 100644
--- a/tools/appstream-compose.c
+++ b/tools/appstream-compose.c
@@ -340,8 +340,8 @@ main (int argc, char **argv)
 			/* TRANSLATORS: Output if appstreamcli --version is run and the CLI and libappstream versions differ. */
 			ascli_print_stdout (
 			    _("AppStream CLI tool version: %s\nAppStream library version: %s"),
-			       PACKAGE_VERSION,
-			       as_version_string ());
+			      PACKAGE_VERSION,
+			      as_version_string ());
 		}
 		return EXIT_SUCCESS;
 	}
@@ -366,7 +366,7 @@ main (int argc, char **argv)
 				      "`on-error` - only prints a short report if the run failed (default)\n"
 				      "`short` - generates an abridged report\n"
 				      "`full` - a detailed report will be printed"),
-		       report_mode_str);
+		      report_mode_str);
 		return EXIT_FAILURE;
 	}
 
@@ -392,7 +392,7 @@ main (int argc, char **argv)
 			res_root_dir = g_strdup (argv[1]);
 			ascli_print_stdout (
 			    _("Automatically selected '%s' as data output location."),
-			       res_root_dir);
+			      res_root_dir);
 		} else {
 			/* TRANSLATORS: We don't have a destination directory for compose */
 			g_printerr ("%s\n",
@@ -517,7 +517,7 @@ main (int argc, char **argv)
 		/* TRANSLATORS: information message of appstream-compose */
 		composecli_print_hints_report (results,
 					       _("Errors were raised during this compose run:"),
-						  report_mode);
+						 report_mode);
 		g_printerr ("%s\n",
 			    _("Refer to the generated issue report data for details on the individual problems."));
 		return EXIT_FAILURE;
diff --git a/tools/appstreamcli.c b/tools/appstreamcli.c
index 9e580a30..6cbea3cd 100644
--- a/tools/appstreamcli.c
+++ b/tools/appstreamcli.c
@@ -221,13 +221,13 @@ as_client_print_help_hint (const gchar *subcommand, const gchar *unknown_option)
 	if (subcommand == NULL)
 		ascli_print_stderr (
 		    _("Run '%s --help' to see a full list of available command line options."),
-		       ASCLI_BIN_NAME);
+		      ASCLI_BIN_NAME);
 	else
 		ascli_print_stderr (
 		    _("Run '%s --help' to see a list of available commands and options, and '%s %s --help' to see a list of options specific for this subcommand."),
-		       ASCLI_BIN_NAME,
-		       ASCLI_BIN_NAME,
-		       subcommand);
+		      ASCLI_BIN_NAME,
+		      ASCLI_BIN_NAME,
+		      subcommand);
 }
 
 /**
@@ -285,8 +285,7 @@ as_client_run_refresh_cache (const gchar *command, char **argv, int argc)
 		    0, G_OPTION_ARG_STRING_ARRAY,
 		    &optn_sources,
 		    /* TRANSLATORS: ascli flag description for: --source in a refresh action. Don't translate strings in backticks: `name` */
-		    _("Limit cache refresh to data from a specific source, e.g. `os` or `flatpak`. May be specified multiple times."),
-		       NULL },
+		    _("Limit cache refresh to data from a specific source, e.g. `os` or `flatpak`. May be specified multiple times."), NULL },
 		    { NULL }
 	     };
 
@@ -864,7 +863,7 @@ as_client_run_compare_versions (const gchar *command, char **argv, int argc)
 			guint i;
 			/** TRANSLATORS: The user tried to compare version numbers, but the comparison operator (greater-then, equal, etc.) was invalid. */
 			ascli_print_stderr (_("Unknown compare relation '%s'. Valid values are:"),
-					       comp_str);
+					      comp_str);
 			for (i = 1; i < AS_RELATION_COMPARE_LAST; i++)
 				g_printerr (" • %s\n", as_relation_compare_to_string (i));
 			return 2;
@@ -1125,11 +1124,11 @@ as_client_run_compose (const gchar *command, char **argv, int argc)
 		/* TRANSLATORS: appstreamcli-compose was not found */
 		ascli_print_stderr (
 		    _("AppStream Compose binary '%s' was not found! Can not continue."),
-		       ascompose_exe);
+		      ascompose_exe);
 		/* TRANSLATORS: appstreamcli-compose was not found - info text */
 		ascli_print_stderr (
 		    _("You may be able to install the AppStream Compose addon via: `%s`"),
-		       "sudo appstreamcli install org.freedesktop.appstream.compose");
+		      "sudo appstreamcli install org.freedesktop.appstream.compose");
 		return 4;
 	}
 
@@ -1251,8 +1250,8 @@ as_client_get_help_summary (GPtrArray *commands)
 	g_string_append_printf (string,
 				"%s\n\n%s\n",
 				_("AppStream command-line interface"),
-				   /* these are commands we can use with appstreamcli */
-				   _("Subcommands:"));
+				  /* these are commands we can use with appstreamcli */
+				  _("Subcommands:"));
 
 	compose_available = as_client_check_compose_available ();
 	blocks_maxlen = g_array_new (FALSE, FALSE, sizeof (guint));
@@ -1331,8 +1330,8 @@ ascli_run_command (GPtrArray *commands, const gchar *command, char **argv, int a
 	/* TRANSLATORS: ascli has been run with unknown command. '%s --help' is the command to receive help and should not be translated. */
 	ascli_print_stderr (
 	    _("Command '%s' is unknown. Run '%s --help' for a list of available commands."),
-	       command,
-	       argv[0]);
+	      command,
+	      argv[0]);
 	return 1;
 }
 
@@ -1402,7 +1401,7 @@ as_client_run (char **argv, int argc)
 		       "TYPE VALUE",
 		       /* TRANSLATORS: `appstreamcli what-provides` command description. */
 		       _("Get components which provide the given item. Needs an item type (e.g. lib, bin, python3, …) and item value as parameter."),
-			  as_client_run_what_provides);
+			 as_client_run_what_provides);
 	ascli_add_cmd (commands,
 		       0,
 		       "list-categories",
@@ -1410,7 +1409,7 @@ as_client_run (char **argv, int argc)
 		       "NAMES",
 		       /* TRANSLATORS: `appstreamcli list-categories` command description. */
 		       _("List components that are part of the specified categories."),
-			  as_client_run_list_categories);
+			 as_client_run_list_categories);
 
 	ascli_add_cmd (commands,
 		       1,
@@ -1419,7 +1418,7 @@ as_client_run (char **argv, int argc)
 		       "COMPONENT-ID",
 		       /* TRANSLATORS: `appstreamcli dump` command description. */
 		       _("Dump raw XML metadata for a component matching the ID."),
-			  as_client_run_dump);
+			 as_client_run_dump);
 	ascli_add_cmd (commands,
 		       1,
 		       "refresh-cache",
@@ -1442,7 +1441,7 @@ as_client_run (char **argv, int argc)
 		       "DIRECTORY",
 		       /* TRANSLATORS: `appstreamcli validate-tree` command description. */
 		       _("Validate an installed file-tree of an application for valid metadata."),
-			  as_client_run_validate_tree);
+			 as_client_run_validate_tree);
 	ascli_add_cmd (commands,
 		       2,
 		       "check-license",
@@ -1450,7 +1449,7 @@ as_client_run (char **argv, int argc)
 		       "LICENSE",
 		       /* TRANSLATORS: `appstreamcli `check-license` command description. */
 		       _("Check license string for validity and print details about it."),
-			  as_client_run_check_license);
+			 as_client_run_check_license);
 	ascli_add_cmd (commands,
 		       2,
 		       "is-satisfied",
@@ -1458,7 +1457,7 @@ as_client_run (char **argv, int argc)
 		       "FILE|COMPONENT-ID",
 		       /* TRANSLATORS: `appstreamcli `check-license` command description. */
 		       _("Check if requirements of a component (via its ID or MetaInfo file) are satisfied on this system."),
-			  as_client_run_is_satisfied);
+			 as_client_run_is_satisfied);
 	ascli_add_cmd (commands,
 		       2,
 		       "check-syscompat",
@@ -1466,7 +1465,7 @@ as_client_run (char **argv, int argc)
 		       "FILE|COMPONENT-ID",
 		       /* TRANSLATORS: `appstreamcli `check-syscompat` command description. */
 		       _("Check compatibility of a component (via its ID or MetaInfo file) with common system and chassis types."),
-			  as_client_run_check_syscompat);
+			 as_client_run_check_syscompat);
 
 	ascli_add_cmd (commands,
 		       3,
@@ -1490,7 +1489,7 @@ as_client_run (char **argv, int argc)
 		       NULL,
 		       /* TRANSLATORS: `appstreamcli status` command description. */
 		       _("Display status information about available AppStream metadata."),
-			  as_client_run_status);
+			 as_client_run_status);
 	ascli_add_cmd (commands,
 		       4,
 		       "sysinfo",
@@ -1498,7 +1497,7 @@ as_client_run (char **argv, int argc)
 		       NULL,
 		       /* TRANSLATORS: `appstreamcli sysinfo` command description. */
 		       _("Show information about the current device and used operating system."),
-			  as_client_run_sysinfo);
+			 as_client_run_sysinfo);
 	ascli_add_cmd (commands,
 		       4,
 		       "put",
@@ -1530,7 +1529,7 @@ as_client_run (char **argv, int argc)
 	    "TYPE FILE",
 	    /* TRANSLATORS: `appstreamcli new-template` command description. */
 	    _("Create a template for a metainfo file (to be filled out by the upstream project)."),
-	       as_client_run_new_template);
+	      as_client_run_new_template);
 	ascli_add_cmd (commands,
 		       5,
 		       "make-desktop-file",
@@ -1538,7 +1537,7 @@ as_client_run (char **argv, int argc)
 		       "MI_FILE DESKTOP_FILE",
 		       /* TRANSLATORS: `appstreamcli make-desktop-file` command description. */
 		       _("Create a desktop-entry file from a metainfo file."),
-			  as_client_run_make_desktop_file);
+			 as_client_run_make_desktop_file);
 	ascli_add_cmd (commands,
 		       5,
 		       "news-to-metainfo",
@@ -1546,7 +1545,7 @@ as_client_run (char **argv, int argc)
 		       "NEWS_FILE MI_FILE [OUT_FILE]",
 		       /* TRANSLATORS: `appstreamcli news-to-metainfo` command description. */
 		       _("Convert a YAML or text NEWS file into metainfo releases."),
-			  as_client_run_news_to_metainfo);
+			 as_client_run_news_to_metainfo);
 	ascli_add_cmd (commands,
 		       5,
 		       "metainfo-to-news",
@@ -1554,7 +1553,7 @@ as_client_run (char **argv, int argc)
 		       "MI_FILE NEWS_FILE",
 		       /* TRANSLATORS: `appstreamcli metainfo-to-news` command description. */
 		       _("Write NEWS text or YAML file with information from a metainfo file."),
-			  as_client_run_metainfo_to_news);
+			 as_client_run_metainfo_to_news);
 	ascli_add_cmd (commands,
 		       5,
 		       "compose",
@@ -1562,7 +1561,7 @@ as_client_run (char **argv, int argc)
 		       NULL,
 		       /* TRANSLATORS: `appstreamcli compose` command description. */
 		       _("Compose AppStream metadata catalog from directory trees."),
-			  as_client_run_compose);
+			 as_client_run_compose);
 
 	/* we handle the unknown options later in the individual subcommands */
 	g_option_context_set_ignore_unknown_options (opt_context, TRUE);
@@ -1572,7 +1571,7 @@ as_client_run (char **argv, int argc)
 		g_printerr ("%s\n", _("You need to specify a command."));
 		ascli_print_stderr (
 		    _("Run '%s --help' to see a full list of available command line options."),
-		       argv[0]);
+		      argv[0]);
 		return 1;
 	}
 	command = argv[1];
@@ -1600,8 +1599,8 @@ as_client_run (char **argv, int argc)
 			/* TRANSLATORS: Output if appstreamcli --version is run and the CLI and libappstream versions differ. */
 			ascli_print_stdout (
 			    _("AppStream CLI tool version: %s\nAppStream library version: %s"),
-			       PACKAGE_VERSION,
-			       as_version_string ());
+			      PACKAGE_VERSION,
+			      as_version_string ());
 		}
 		return 0;
 	}
diff --git a/tools/ascli-actions-mdata.c b/tools/ascli-actions-mdata.c
index a11ffb3d..b3e0806e 100644
--- a/tools/ascli-actions-mdata.c
+++ b/tools/ascli-actions-mdata.c
@@ -65,8 +65,9 @@ ascli_refresh_cache (const gchar *cachepath,
 				g_print ("• %s\n",
 					 _("Updating software metadata cache for Flatpak."));
 			} else {
-				ascli_print_stderr (_("A metadata source group with the name '%s' does not exist!"),
-				    sources_str[i]);
+				ascli_print_stderr (
+				    _("A metadata source group with the name '%s' does not exist!"),
+				      sources_str[i]);
 				return 1;
 			}
 		}
@@ -477,12 +478,11 @@ ascli_create_metainfo_template (const gchar *out_fname,
 	if (cpt_kind == AS_COMPONENT_KIND_UNKNOWN) {
 		if (cpt_kind_str == NULL) {
 			/* TRANSLATORS: The user tried to create a new template, but supplied a wrong component-type string */
-			ascli_print_stderr (
-			    _("You need to give an AppStream software component type to generate a template. Possible values are:"));
+			ascli_print_stderr (_("You need to give an AppStream software component type to generate a template. Possible values are:"));
 		} else {
 			/* TRANSLATORS: The user tried to create a new template, but supplied a wrong component-type string */
 			ascli_print_stderr (_("The software component type '%s' is not valid in AppStream. Possible values are:"),
-					       cpt_kind_str);
+					      cpt_kind_str);
 		}
 		for (guint i = 1; i < AS_COMPONENT_KIND_LAST; i++)
 			ascli_print_stderr (" • %s", as_component_kind_to_string (i));
@@ -502,14 +502,14 @@ ascli_create_metainfo_template (const gchar *out_fname,
 		defile = g_file_new_for_path (desktop_file);
 		if (!g_file_query_exists (defile, NULL)) {
 			ascli_print_stderr (_("The .desktop file '%s' does not exist."),
-					       desktop_file);
+					      desktop_file);
 			return 4;
 		}
 
 		as_metadata_parse_file (metad, defile, AS_FORMAT_KIND_DESKTOP_ENTRY, &error);
 		if (error != NULL) {
 			ascli_print_stderr (_("Unable to read the .desktop file: %s"),
-					       error->message);
+					      error->message);
 			return 1;
 		}
 
@@ -599,7 +599,7 @@ ascli_create_metainfo_template (const gchar *out_fname,
 								  &error);
 		if (error != NULL) {
 			ascli_print_stderr (_("Unable to build the template metainfo file: %s"),
-					       error->message);
+					      error->message);
 			return 1;
 		}
 
@@ -608,7 +608,7 @@ ascli_create_metainfo_template (const gchar *out_fname,
 		as_metadata_save_metainfo (metad, out_fname, AS_FORMAT_KIND_XML, &error);
 		if (error != NULL) {
 			ascli_print_stderr (_("Unable to save the template metainfo file: %s"),
-					       error->message);
+					      error->message);
 			return 1;
 		}
 	}
@@ -732,7 +732,7 @@ ascli_check_is_satisfied (const gchar *fname_or_cid, const gchar *cachepath, gbo
 		cbox = as_pool_get_components_by_id (pool, fname_or_cid);
 		if (as_component_box_is_empty (cbox)) {
 			ascli_print_stderr (_("Unable to find component with ID '%s'!"),
-					       fname_or_cid);
+					      fname_or_cid);
 			return ASCLI_EXIT_CODE_NO_RESULT;
 		}
 
@@ -864,7 +864,7 @@ ascli_check_syscompat (const gchar *fname_or_cid,
 		cbox = as_pool_get_components_by_id (pool, fname_or_cid);
 		if (as_component_box_is_empty (cbox)) {
 			ascli_print_stderr (_("Unable to find component with ID '%s'!"),
-					       fname_or_cid);
+					      fname_or_cid);
 			return ASCLI_EXIT_CODE_NO_RESULT;
 		}
 
@@ -873,7 +873,7 @@ ascli_check_syscompat (const gchar *fname_or_cid,
 
 	/* TRANSLATORS: We are testing compatibility of a component with a common representation of hardware for a specific chassis (phone/tablet/desktop, etc.) */
 	ascli_print_stdout (_("Chassis compatibility check for: %s"),
-			       as_component_get_data_id (cpt));
+			      as_component_get_data_id (cpt));
 
 	for (guint chassis = AS_CHASSIS_KIND_DESKTOP; chassis < AS_CHASSIS_KIND_LAST; chassis++) {
 		g_autoptr(AsSystemInfo) sysinfo = NULL;
@@ -912,7 +912,7 @@ ascli_check_syscompat (const gchar *fname_or_cid,
 					g_print (" %s %s: %s\n",
 						 "•",
 						 _("ERROR"),
-						    as_relation_check_result_get_message (rcr));
+						   as_relation_check_result_get_message (rcr));
 					continue;
 				}
 
diff --git a/tools/ascli-actions-misc.c b/tools/ascli-actions-misc.c
index 348ade3e..2f3a2246 100644
--- a/tools/ascli-actions-misc.c
+++ b/tools/ascli-actions-misc.c
@@ -84,12 +84,12 @@ ascli_show_status (void)
 			marker = ASCLI_CHAR_SUCCESS;
 
 		tmp = g_strdup_printf (_("We have information on %i software components."),
-					  as_component_box_len (cbox));
+					 as_component_box_len (cbox));
 		ascli_print_stdout ("%s %s", marker, tmp);
 	} else {
 		g_autofree gchar *tmp = NULL;
 		tmp = g_strdup_printf (_("Error while loading the metadata pool: %s"),
-					  error->message);
+					 error->message);
 		ascli_print_stderr ("%s %s", ASCLI_CHAR_FAIL, tmp);
 	}
 
@@ -150,8 +150,8 @@ ascli_make_desktop_entry_file (const gchar *mi_fname, const gchar *de_fname, con
 	if (g_file_test (de_fname, G_FILE_TEST_EXISTS)) {
 		ascli_print_stdout (
 		    _("Augmenting existing desktop-entry file '%s' with data from '%s'."),
-		       de_fname_basename,
-		       mi_fname_basename);
+		      de_fname_basename,
+		      mi_fname_basename);
 		if (!g_key_file_load_from_file (de_file,
 						de_fname,
 						G_KEY_FILE_KEEP_COMMENTS |
@@ -159,13 +159,13 @@ ascli_make_desktop_entry_file (const gchar *mi_fname, const gchar *de_fname, con
 						&error)) {
 			ascli_print_stderr (
 			    _("Unable to load existing desktop-entry file template: %s"),
-			       error->message);
+			      error->message);
 			return 1;
 		}
 	} else {
 		ascli_print_stdout (_("Creating new desktop-entry file '%s' using data from '%s'"),
-				       de_fname_basename,
-				       mi_fname_basename);
+				      de_fname_basename,
+				      mi_fname_basename);
 	}
 
 	g_key_file_set_string (de_file,
@@ -553,7 +553,7 @@ ascli_show_sysinfo (const gchar *cachepath, gboolean no_cache, gboolean detailed
 	if (as_component_box_is_empty (result)) {
 		g_printerr ("• ");
 		ascli_print_stderr (_("Unable to find operating system component '%s'!"),
-				       as_system_info_get_os_cid (sysinfo));
+				      as_system_info_get_os_cid (sysinfo));
 	}
 
 	for (guint i = 0; i < as_component_box_len (result); i++) {
@@ -564,13 +564,13 @@ ascli_show_sysinfo (const gchar *cachepath, gboolean no_cache, gboolean detailed
 		ascli_print_stdout ("%s: %s", _("Summary"), as_component_get_summary (cpt));
 		if (as_system_info_get_os_version (sysinfo) != NULL)
 			ascli_print_stdout (_("Version: %s"),
-					       as_system_info_get_os_version (sysinfo));
+					      as_system_info_get_os_version (sysinfo));
 		ascli_print_stdout ("%s: %s",
 				    _("Homepage"),
-				       as_component_get_url (cpt, AS_URL_KIND_HOMEPAGE));
+				      as_component_get_url (cpt, AS_URL_KIND_HOMEPAGE));
 		ascli_print_stdout ("%s: %s",
 				    _("Developer"),
-				       as_developer_get_name (as_component_get_developer (cpt)));
+				      as_developer_get_name (as_component_get_developer (cpt)));
 		if (detailed) {
 			g_autofree gchar *tmp2 = NULL;
 			g_autofree gchar *tmp1 = as_markup_convert (
diff --git a/tools/ascli-actions-pkgmgr.c b/tools/ascli-actions-pkgmgr.c
index 690ae31b..fc844d9b 100644
--- a/tools/ascli-actions-pkgmgr.c
+++ b/tools/ascli-actions-pkgmgr.c
@@ -152,7 +152,7 @@ ascli_get_component_instrm_candidate (const gchar *identifier,
 	if (as_component_box_is_empty (result_filtered)) {
 		ascli_print_stderr (
 		    _("Unable to find component with ID '%s' and the selected filter criteria!"),
-		       identifier);
+		      identifier);
 		return ASCLI_EXIT_CODE_NO_RESULT;
 	}
 
@@ -187,12 +187,12 @@ ascli_get_component_instrm_candidate (const gchar *identifier,
 			/* TRANSLATORS: A list of components is displayed with number prefixes. This is a prompt for the user to select one. */
 			selection = ascli_prompt_numer (
 			    _("Please enter the number of the component to remove:"),
-			       as_component_box_len (result_filtered));
+			      as_component_box_len (result_filtered));
 		else
 			/* TRANSLATORS: A list of components is displayed with number prefixes. This is a prompt for the user to select one. */
 			selection = ascli_prompt_numer (
 			    _("Please enter the number of the component to install:"),
-			       as_component_box_len (result_filtered));
+			      as_component_box_len (result_filtered));
 		r_cpt = as_component_box_index (result_filtered, selection - 1);
 	}
 
@@ -201,8 +201,7 @@ ascli_get_component_instrm_candidate (const gchar *identifier,
 
 	if (as_component_get_bundle (r_cpt, AS_BUNDLE_KIND_FLATPAK) == NULL &&
 	    as_component_get_pkgname (r_cpt) == NULL) {
-		ascli_print_stderr (_("Component '%s' has no installation candidate."),
-				       identifier);
+		ascli_print_stderr (_("Component '%s' has no installation candidate."), identifier);
 		return ASCLI_EXIT_CODE_FAILED;
 	}
 
diff --git a/tools/ascli-actions-validate.c b/tools/ascli-actions-validate.c
index cee80d30..e2599797 100644
--- a/tools/ascli-actions-validate.c
+++ b/tools/ascli-actions-validate.c
@@ -257,7 +257,7 @@ ascli_validate_apply_overrides_from_string (AsValidator *validator, const gchar
 			/* TRANSLATORS: User-supplied overrides string for appstreamcli was badly formatted
 			   (tag is an issue tag, severity is the desired severity that it should be set to). */
 			g_printerr (_("The format of validator issue override '%s' is invalid (should be 'tag=severity')"),
-				       overrides[i]);
+				      overrides[i]);
 			g_printerr ("\n");
 			return FALSE;
 		}
@@ -404,7 +404,7 @@ ascli_validate_files (gchar **argv,
 			g_autoptr(GFile) file = g_file_new_for_path (argv[i]);
 			if (!as_validator_add_release_file (validator, file, &local_error)) {
 				ascli_print_stderr (_("Unable to add release metadata file: %s"),
-						       local_error->message);
+						      local_error->message);
 				return ASCLI_EXIT_CODE_FATAL;
 			}
 		} else {
@@ -443,8 +443,8 @@ ascli_validate_files (gchar **argv,
 		    (pedantic_count == 0)) {
 			g_print ("%s %s\n", ASCLI_CHAR_SUCCESS, _("Validation was successful."));
 		} else {
-			g_autofree gchar *tmp = g_strdup_printf (
-			    _("Validation was successful: %s"), "");
+			g_autofree gchar *tmp = g_strdup_printf (_("Validation was successful: %s"),
+								   "");
 			g_print ("%s %s", ASCLI_CHAR_SUCCESS, tmp);
 			ascli_validate_print_stats (error_count,
 						    warning_count,
@@ -524,7 +524,7 @@ ascli_validate_files_format (gchar **argv,
 	}
 
 	g_print (_("The validator can not create reports in the '%s' format. You may select 'yaml' or 'text' instead."),
-		    format);
+		   format);
 	g_print ("\n");
 	return 1;
 }
@@ -576,8 +576,8 @@ ascli_validate_tree (const gchar *root_dir,
 		    (pedantic_count == 0)) {
 			g_print ("%s %s\n", ASCLI_CHAR_SUCCESS, _("Validation was successful."));
 		} else {
-			g_autofree gchar *tmp = g_strdup_printf (
-			    _("Validation was successful: %s"), "");
+			g_autofree gchar *tmp = g_strdup_printf (_("Validation was successful: %s"),
+								   "");
 			g_print ("%s %s", ASCLI_CHAR_SUCCESS, tmp);
 			ascli_validate_print_stats (error_count,
 						    warning_count,
@@ -645,7 +645,7 @@ ascli_validate_tree_format (const gchar *root_dir,
 	}
 
 	g_print (_("The validator can not create reports in the '%s' format. You may select 'yaml' or 'text' instead."),
-		    format);
+		   format);
 	g_print ("\n");
 	return 1;
 }
@@ -696,15 +696,15 @@ ascli_check_license (const gchar *license)
 
 	/* TRANSLATORS: Whether a license is suitable for AppStream metadata */
 	ascli_print_key_value (_("Suitable for AppStream metadata"),
-				  as_license_is_metadata_license (license_id)
-				  ? _("yes")
-				  : _("no"), FALSE);
+				 as_license_is_metadata_license (license_id)
+				 ? _("yes")
+				 : _("no"), FALSE);
 
 	/* TRANSLATORS: Whether a license considered suitable for Free and Open Source software */
 	ascli_print_key_value (_("Free and Open Source"),
-				  as_license_is_free_license (license_id)
-				  ? _("yes")
-				  : _("no"), FALSE);
+				 as_license_is_free_license (license_id)
+				 ? _("yes")
+				 : _("no"), FALSE);
 
 	if (!is_expression) {
 		g_autofree gchar *url = as_get_license_url (license_id);
diff --git a/tools/ascli-utils.c b/tools/ascli-utils.c
index 99e8617b..44accaf6 100644
--- a/tools/ascli-utils.c
+++ b/tools/ascli-utils.c
@@ -326,9 +326,8 @@ ascli_print_component (AsComponent *cpt, gboolean show_detailed)
 		gchar *str;
 
 		/* developer name */
-		ascli_print_key_value (_("Developer"),
-					  as_developer_get_name (as_component_get_developer (cpt)),
-					  TRUE);
+		ascli_print_key_value (
+		    _("Developer"), as_developer_get_name (as_component_get_developer (cpt)), TRUE);
 
 		/* extends data (e.g. for addons) */
 		extends = as_component_get_extends (cpt);
@@ -363,8 +362,8 @@ ascli_print_component (AsComponent *cpt, gboolean show_detailed)
 				img = AS_IMAGE (g_ptr_array_index (imgs, j));
 				if (as_image_get_kind (img) == AS_IMAGE_KIND_SOURCE) {
 					ascli_print_key_value (_("Default Screenshot URL"),
-								  as_image_get_url (img),
-								  TRUE);
+								 as_image_get_url (img),
+								 TRUE);
 					break;
 				}
 			}