metadata: fix more coding style issues

lib/wp/metadata.c

@@ -133,7 +133,8 @@ emit_properties(WpImplMetadata *self,
 	const struct spa_dict *dict)
 {
   struct item *item;
-  WpMetadataPrivate *priv = wp_metadata_get_instance_private (WP_METADATA (self));
+  WpMetadataPrivate *priv =
+      wp_metadata_get_instance_private (WP_METADATA (self));
 
   pw_array_for_each(item, &priv->metadata) {
     wp_info_object (self, "metadata : %d %s %s %s",
@@ -153,14 +154,14 @@ impl_add_listener(void *object,
     void *data)
 {
   WpImplMetadata *self = WP_IMPL_METADATA (object);
-  WpMetadataPrivate *priv = wp_metadata_get_instance_private (WP_METADATA (self));
+  WpMetadataPrivate *priv =
+      wp_metadata_get_instance_private (WP_METADATA (self));
   struct spa_hook_list save;
 
   spa_hook_list_isolate (&priv->hooks, &save, listener, events, data);
-
   emit_properties(self, &priv->properties->dict);
-
   spa_hook_list_join (&priv->hooks, &save);
+
   return 0;
 }
 
@@ -168,11 +169,11 @@ static struct item *
 find_item (WpImplMetadata *self, uint32_t subject, const char *key)
 {
   struct item *item;
-  WpMetadataPrivate *priv = wp_metadata_get_instance_private (WP_METADATA (self));
+  WpMetadataPrivate *priv =
+      wp_metadata_get_instance_private (WP_METADATA (self));
 
   pw_array_for_each(item, &priv->metadata) {
-    if (item->subject == subject && (key == NULL || 
-      !strcmp(item->key, key))) {
+    if (item->subject == subject && (key == NULL || !strcmp (item->key, key))) {
       return item;
     }
   }
@@ -184,7 +185,8 @@ clear_subjects(WpImplMetadata *self, uint32_t subject)
 {
   struct item *item;
   uint32_t removed = 0;
-  WpMetadataPrivate *priv = wp_metadata_get_instance_private (WP_METADATA (self));
+  WpMetadataPrivate *priv =
+      wp_metadata_get_instance_private (WP_METADATA (self));
 
   while (true) {
     item = find_item(self, subject, NULL);
@@ -197,8 +199,10 @@ clear_subjects(WpImplMetadata *self, uint32_t subject)
     pw_array_remove (&priv->metadata, item);
     removed++;
   }
+
   if (removed > 0)
     pw_metadata_emit_property (&priv->hooks, subject, NULL, NULL, NULL);
+
   return 0;
 }
 
@@ -206,10 +210,12 @@ static void
 clear_items (WpImplMetadata *self)
 {
   struct item *item;
-  WpMetadataPrivate *priv = wp_metadata_get_instance_private (WP_METADATA (self));
+  WpMetadataPrivate *priv =
+      wp_metadata_get_instance_private (WP_METADATA (self));
 
-  pw_array_consume(item, &priv->metadata)
+  pw_array_consume (item, &priv->metadata) {
     clear_subjects (self, item->subject);
+  }
   pw_array_reset (&priv->metadata);
 }
 
@@ -242,12 +248,12 @@ impl_set_property(void *object, uint32_t subject, const char *key,
     if (type == NULL)
       type = "string";
     set_item (item, subject, key, type, value);
-    wp_debug_object (self, "%p: add id:%d key:%s type:%s value:%s", self,
+    wp_debug_object (self, "add id:%d key:%s type:%s value:%s",
         subject, key, type, value);
   } else {
     type = NULL;
     pw_array_remove (&priv->metadata, item);
-    wp_debug_object(self, "%p: remove id:%d key:%s", self, subject, key);
+    wp_debug_object (self, "remove id:%d key:%s", subject, key);
   }
 
   pw_metadata_emit_property (&priv->hooks, subject, key, type, value);
@@ -259,8 +265,8 @@ static int
 impl_clear (void *object)
 {
   WpImplMetadata *self = WP_IMPL_METADATA (object);
-
-  WpMetadataPrivate *priv = wp_metadata_get_instance_private (WP_METADATA (self));
+  WpMetadataPrivate *priv =
+      wp_metadata_get_instance_private (WP_METADATA (self));
   clear_items (self);
   pw_array_clear (&priv->metadata);
   pw_properties_free (priv->properties);
@@ -277,7 +283,8 @@ static const struct pw_metadata_methods impl_metadata = {
 static void
 wp_impl_metadata_init (WpImplMetadata * self)
 {
-  WpMetadataPrivate *priv = wp_metadata_get_instance_private (WP_METADATA (self));
+  WpMetadataPrivate *priv =
+      wp_metadata_get_instance_private (WP_METADATA (self));
 
   self->iface = SPA_INTERFACE_INIT (
       PW_TYPE_INTERFACE_Metadata,
@@ -301,7 +308,8 @@ static void
 wp_impl_metadata_augment (WpProxy * proxy, WpProxyFeatures features)
 {
   WpImplMetadata *self = WP_IMPL_METADATA (proxy);
-  WpMetadataPrivate *priv = wp_metadata_get_instance_private (WP_METADATA (self));
+  WpMetadataPrivate *priv =
+      wp_metadata_get_instance_private (WP_METADATA (self));
 
   /* PW_PROXY depends on BOUND */
   if (features & WP_PROXY_FEATURE_PW_PROXY)
@@ -317,7 +325,6 @@ wp_impl_metadata_augment (WpProxy * proxy, WpProxyFeatures features)
               WP_LIBRARY_ERROR_OPERATION_FAILED,
               "The WirePlumber core is not connected; "
               "object cannot be exported to PipeWire"));
-    wp_critical(G_LOG_DOMAIN "metadata : FAIL - Exiting %s",__FUNCTION__);
       return;
     }
 

lib/wp/metadata.h

@@ -15,12 +15,14 @@ G_BEGIN_DECLS
 
 #define WP_METADATA_FEATURES_STANDARD \
     (WP_PROXY_FEATURES_STANDARD)
+
 /**
  * WP_TYPE_METADATA:
  *
  * The #WpMetadata #GType
  */
 #define WP_TYPE_METADATA (wp_metadata_get_type ())
+
 WP_API
 G_DECLARE_DERIVABLE_TYPE (WpMetadata, wp_metadata, WP, METADATA, WpProxy)
 
@@ -36,10 +38,13 @@ struct _WpMetadataClass
  * The #WpImplMetadata #GType
  */
 #define WP_TYPE_IMPL_METADATA (wp_impl_metadata_get_type ())
+
 WP_API
 G_DECLARE_FINAL_TYPE (WpImplMetadata, wp_impl_metadata, WP, IMPL_METADATA, WpMetadata)
+
 WP_API
 WpImplMetadata * wp_impl_metadata_new (WpCore * core);
+
 G_END_DECLS
 
 #endif