Make ComponentBox array getter follow naming conventions

ximion · Nov 8, 2023 · 3289341 · 3289341
1 parent e2d271b
commit 3289341
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 16 deletions.
diff --git a/src/as-component-box.c b/src/as-component-box.c
@@ -207,15 +207,15 @@ as_component_box_new_simple (void)
  */
 
 /**
- * as_component_box_array:
+ * as_component_box_as_array:
  * @cbox: An instance of #AsComponentBox.
  *
  * Get the contents of this component box as #GPtrArray.
  *
  * Returns: (transfer none) (element-type AsComponent): an array of #AsComponent instances.
  */
 GPtrArray *
-as_component_box_array (AsComponentBox *cbox)
+as_component_box_as_array (AsComponentBox *cbox)
 {
 	return cbox->cpts;
 }

diff --git a/src/as-component-box.h b/src/as-component-box.h
@@ -75,7 +75,7 @@ AsComponentBox *as_component_box_new_simple (void);
 	AS_COMPONENT (g_ptr_array_index ((cbox)->cpts, (index_)))
 #define as_component_box_len(cbox) (cbox)->cpts->len
 
-GPtrArray	   *as_component_box_array (AsComponentBox *cbox);
+GPtrArray	   *as_component_box_as_array (AsComponentBox *cbox);
 AsComponentBoxFlags as_component_box_get_flags (AsComponentBox *cbox);
 
 guint		    as_component_box_get_size (AsComponentBox *cbox);

diff --git a/src/as-metadata.c b/src/as-metadata.c
@@ -1407,19 +1407,20 @@ as_metadata_components_to_catalog (AsMetadata *metad, AsFormatKind format, GErro
 			return as_metadata_xml_serialize_to_catalog_with_rootnode (
 			    metad,
 			    context,
-			    as_component_box_array (priv->cbox));
+			    as_component_box_as_array (priv->cbox));
 		else
 			return as_metadata_xml_serialize_to_catalog_without_rootnode (
 			    metad,
 			    context,
-			    as_component_box_array (priv->cbox));
+			    as_component_box_as_array (priv->cbox));
 	} else if (format == AS_FORMAT_KIND_YAML) {
-		return as_metadata_yaml_serialize_to_catalog (metad,
-							      context,
-							      as_component_box_array (priv->cbox),
-							      priv->write_header,
-							      TRUE, /* add timestamp */
-							      error);
+		return as_metadata_yaml_serialize_to_catalog (
+		    metad,
+		    context,
+		    as_component_box_as_array (priv->cbox),
+		    priv->write_header,
+		    TRUE, /* add timestamp */
+		    error);
 	} else {
 		g_set_error (error,
 			     AS_METADATA_ERROR,

diff --git a/src/as-pool.c b/src/as-pool.c
@@ -981,7 +981,9 @@ gboolean
 as_pool_add_components (AsPool *pool, AsComponentBox *cbox, GError **error)
 {
 	AsPoolPrivate *priv = GET_PRIVATE (pool);
-	return as_cache_add_masking_components (priv->cache, as_component_box_array (cbox), error);
+	return as_cache_add_masking_components (priv->cache,
+						as_component_box_as_array (cbox),
+						error);
 }
 
 /**

diff --git a/tests/test-performance.c b/tests/test-performance.c
@@ -142,7 +142,7 @@ test_pool_cache_perf (void)
 		as_cache_set_locale (tmp_cache, "C");
 
 		as_cache_set_contents_for_path (tmp_cache,
-						as_component_box_array (prep_cpts),
+						as_component_box_as_array (prep_cpts),
 						"dummy",
 						NULL,
 						&error);
@@ -156,7 +156,7 @@ test_pool_cache_perf (void)
 	cache = as_cache_new ();
 	as_cache_set_locale (cache, "C");
 	as_cache_set_contents_for_path (cache,
-					as_component_box_array (prep_cpts),
+					as_component_box_as_array (prep_cpts),
 					"dummy",
 					NULL,
 					&error);

diff --git a/tests/test-pool.c b/tests/test-pool.c
@@ -277,7 +277,7 @@ test_cache (void)
 	cpts_post = as_cache_get_components_all (cache, &error);
 	g_assert_no_error (error);
 	g_assert_cmpint (as_component_box_len (cpts_post), ==, 20);
-	as_assert_component_lists_equal (as_component_box_array (cpts_post), cpts_pre);
+	as_assert_component_lists_equal (as_component_box_as_array (cpts_post), cpts_pre);
 
 	/* generate XML of the components retrieved from cache */
 	as_metadata_clear_components (mdata);
@@ -447,7 +447,7 @@ test_pool_read (void)
 
 	/* check categorization */
 	categories = as_get_default_categories (TRUE);
-	as_utils_sort_components_into_categories (as_component_box_array (all_cpts),
+	as_utils_sort_components_into_categories (as_component_box_as_array (all_cpts),
 						  categories,
 						  FALSE);
 	for (guint i = 0; i < categories->len; i++) {