pipewire: remove cleanup.h

Since `spa/utils/cleanup.h` is not a private header anymore, there is
no need for a separate `pipewire/cleanup.h` since the definitions of
the cleanup routines can now be moved into the respective headers.

.gitlab/ci/check_missing_headers.sh

@@ -10,7 +10,7 @@ do
 	[ -f "$PREFIX/include/spa-0.2/$i" ] || LIST="$i $LIST"
 done
 
-for i in $(find src/pipewire -name '*.h' -a -not -name '*private.h' -a -not -name 'cleanup.h' | sed s#src/##);
+for i in $(find src/pipewire -name '*.h' -a -not -name '*private.h' | sed s#src/##);
 do
 	[ -f "$PREFIX/include/pipewire-0.3/$i" ] || LIST="$i $LIST"
 done

src/modules/module-access.c

@@ -20,12 +20,12 @@
 #include <sys/mount.h>
 #endif
 
+#include <spa/utils/cleanup.h>
 #include <spa/utils/result.h>
 #include <spa/utils/string.h>
 #include <spa/utils/json.h>
 
 #include <pipewire/impl.h>
-#include <pipewire/cleanup.h>
 
 #include "flatpak-utils.h"
 

src/modules/module-protocol-native.c

@@ -29,6 +29,7 @@
 #include <spa/pod/iter.h>
 #include <spa/pod/parser.h>
 #include <spa/pod/builder.h>
+#include <spa/utils/cleanup.h>
 #include <spa/utils/result.h>
 #include <spa/utils/string.h>
 #include <spa/utils/json.h>
@@ -44,7 +45,6 @@
 
 #include <pipewire/impl.h>
 #include <pipewire/extensions/protocol-native.h>
-#include <pipewire/cleanup.h>
 
 #include "pipewire/private.h"
 

src/modules/module-protocol-pulse/cmd.c

@@ -2,9 +2,9 @@
 /* SPDX-FileCopyrightText: Copyright © 2022 Wim Taymans */
 /* SPDX-License-Identifier: MIT */
 
+#include <spa/utils/cleanup.h>
 #include <spa/utils/json.h>
 
-#include <pipewire/cleanup.h>
 #include <pipewire/utils.h>
 
 #include "module.h"

src/modules/module-protocol-pulse/module.c

@@ -7,11 +7,11 @@
 #include <string.h>
 #include <ctype.h>
 
+#include <spa/utils/cleanup.h>
 #include <spa/utils/defs.h>
 #include <spa/utils/list.h>
 #include <spa/utils/hook.h>
 #include <spa/utils/string.h>
-#include <pipewire/cleanup.h>
 #include <pipewire/log.h>
 #include <pipewire/map.h>
 #include <pipewire/properties.h>

src/modules/module-protocol-pulse/pulse-server.c

@@ -16,6 +16,7 @@
 #include "log.h"
 
 #include <spa/support/cpu.h>
+#include <spa/utils/cleanup.h>
 #include <spa/utils/result.h>
 #include <spa/utils/string.h>
 #include <spa/debug/dict.h>
@@ -28,7 +29,6 @@
 #include <spa/utils/ringbuffer.h>
 #include <spa/utils/json.h>
 
-#include <pipewire/cleanup.h>
 #include <pipewire/pipewire.h>
 #include <pipewire/extensions/metadata.h>
 

src/modules/module-protocol-pulse/server.c

@@ -25,10 +25,10 @@
 #include <systemd/sd-daemon.h>
 #endif
 
+#include <spa/utils/cleanup.h>
 #include <spa/utils/defs.h>
 #include <spa/utils/json.h>
 #include <spa/utils/result.h>
-#include <pipewire/cleanup.h>
 #include <pipewire/pipewire.h>
 
 #include "client.h"

src/modules/module-raop-sink.c

@@ -30,6 +30,7 @@
 
 #include "config.h"
 
+#include <spa/utils/cleanup.h>
 #include <spa/utils/result.h>
 #include <spa/utils/string.h>
 #include <spa/utils/json.h>
@@ -40,7 +41,6 @@
 #include <spa/param/audio/raw.h>
 #include <spa/param/latency-utils.h>
 
-#include <pipewire/cleanup.h>
 #include <pipewire/impl.h>
 #include <pipewire/i18n.h>
 

src/modules/module-roc-sink.c

@@ -19,7 +19,6 @@
 #include <roc/log.h>
 #include <roc/sender.h>
 
-#include <pipewire/cleanup.h>
 #include <pipewire/pipewire.h>
 #include <pipewire/impl.h>
 

src/modules/module-roc-source.c

@@ -19,7 +19,6 @@
 #include <roc/log.h>
 #include <roc/receiver.h>
 
-#include <pipewire/cleanup.h>
 #include <pipewire/pipewire.h>
 #include <pipewire/impl.h>
 

src/modules/spa/module-device.c

@@ -8,7 +8,6 @@
 #include <getopt.h>
 #include <limits.h>
 
-#include <pipewire/cleanup.h>
 #include <pipewire/impl.h>
 
 #include "spa-device.h"

src/modules/spa/module-node-factory.c

@@ -12,7 +12,6 @@
 #include "config.h"
 
 #include "pipewire/impl.h"
-#include "pipewire/cleanup.h"
 
 #include "spa-node.h"
 

src/modules/spa/module-node.c

@@ -10,7 +10,6 @@
 #include <getopt.h>
 #include <limits.h>
 
-#include <pipewire/cleanup.h>
 #include <pipewire/impl.h>
 
 #include "spa-node.h"

src/pipewire/cleanup.h

@@ -1,21 +0,0 @@
-/* PipeWire */
-/* SPDX-FileCopyrightText: Copyright © 2023 PipeWire authors */
-/* SPDX-License-Identifier: MIT */
-
-#ifndef PIPEWIRE_CLEANUP_H
-#define PIPEWIRE_CLEANUP_H
-
-#include <spa/utils/cleanup.h>
-
-#include <pipewire/properties.h>
-#include <pipewire/utils.h>
-
-SPA_DEFINE_AUTOPTR_CLEANUP(pw_properties, struct pw_properties, {
-	spa_clear_ptr(*thing, pw_properties_free);
-})
-
-SPA_DEFINE_AUTO_CLEANUP(pw_strv, char **, {
-	spa_clear_ptr(*thing, pw_free_strv);
-})
-
-#endif /* PIPEWIRE_CLEANUP_H */

src/pipewire/conf.c

@@ -24,12 +24,12 @@
 #endif
 #endif
 
+#include <spa/utils/cleanup.h>
 #include <spa/utils/result.h>
 #include <spa/utils/string.h>
 #include <spa/utils/json.h>
 #include <spa/debug/log.h>
 
-#include <pipewire/cleanup.h>
 #include <pipewire/impl.h>
 #include <pipewire/private.h>
 

src/pipewire/filter.c

@@ -12,13 +12,13 @@
 #include <spa/param/props.h>
 #include <spa/node/io.h>
 #include <spa/node/utils.h>
+#include <spa/utils/cleanup.h>
 #include <spa/utils/ringbuffer.h>
 #include <spa/utils/string.h>
 #include <spa/pod/filter.h>
 #include <spa/pod/dynamic.h>
 #include <spa/debug/types.h>
 
-#include <pipewire/cleanup.h>
 #include "pipewire/pipewire.h"
 #include "pipewire/filter.h"
 #include "pipewire/private.h"

src/pipewire/impl-device.c

@@ -12,7 +12,6 @@
 #include <spa/utils/json-pod.h>
 
 #include "pipewire/impl.h"
-#include "pipewire/cleanup.h"
 #include "pipewire/private.h"
 
 PW_LOG_TOPIC_EXTERN(log_device);

src/pipewire/impl-metadata.c

@@ -5,9 +5,9 @@
 #include <errno.h>
 
 #include <spa/debug/types.h>
+#include <spa/utils/cleanup.h>
 #include <spa/utils/string.h>
 
-#include <pipewire/cleanup.h>
 #include "pipewire/impl.h"
 #include "pipewire/private.h"
 

src/pipewire/impl-module.c

@@ -13,9 +13,9 @@
 #include <sys/stat.h>
 #include <errno.h>
 
+#include <spa/utils/cleanup.h>
 #include <spa/utils/string.h>
 
-#include <pipewire/cleanup.h>
 #include "pipewire/impl.h"
 #include "pipewire/private.h"
 

src/pipewire/log.c

@@ -17,7 +17,6 @@
 
 #include <pipewire/log.h>
 #include <pipewire/private.h>
-#include <pipewire/cleanup.h>
 
 SPA_LOG_IMPL(default_log);
 

src/pipewire/pipewire.c

@@ -25,7 +25,6 @@
 #include <spa/support/cpu.h>
 #include <spa/support/i18n.h>
 
-#include <pipewire/cleanup.h>
 #include "pipewire.h"
 #include "private.h"
 #include "i18n.h"

src/pipewire/properties.h

@@ -11,6 +11,7 @@ extern "C" {
 
 #include <stdarg.h>
 
+#include <spa/utils/cleanup.h>
 #include <spa/utils/dict.h>
 #include <spa/utils/string.h>
 
@@ -184,6 +185,10 @@ static inline double pw_properties_parse_double(const char *value) {
  * \}
  */
 
+SPA_DEFINE_AUTOPTR_CLEANUP(pw_properties, struct pw_properties, {
+	spa_clear_ptr(*thing, pw_properties_free);
+})
+
 #ifdef __cplusplus
 }
 #endif

src/pipewire/stream.c

@@ -13,6 +13,7 @@
 #include <spa/param/format-utils.h>
 #include <spa/node/io.h>
 #include <spa/node/utils.h>
+#include <spa/utils/cleanup.h>
 #include <spa/utils/ringbuffer.h>
 #include <spa/pod/filter.h>
 #include <spa/pod/dynamic.h>
@@ -20,7 +21,6 @@
 
 #define PW_ENABLE_DEPRECATED
 
-#include <pipewire/cleanup.h>
 #include "pipewire/pipewire.h"
 #include "pipewire/stream.h"
 #include "pipewire/private.h"

src/pipewire/utils.h

@@ -21,6 +21,7 @@ extern "C" {
 #define ENODATA 9919
 #endif
 
+#include <spa/utils/cleanup.h>
 #include <spa/utils/defs.h>
 #include <spa/pod/pod.h>
 
@@ -99,6 +100,10 @@ void* pw_reallocarray(void *ptr, size_t nmemb, size_t size);
  * \}
  */
 
+SPA_DEFINE_AUTO_CLEANUP(pw_strv, char **, {
+	spa_clear_ptr(*thing, pw_free_strv);
+})
+
 #ifdef __cplusplus
 } /* extern "C" */
 #endif

src/tools/pw-cat.c

@@ -28,7 +28,6 @@
 #include <spa/debug/types.h>
 #include <spa/debug/file.h>
 
-#include <pipewire/cleanup.h>
 #include <pipewire/pipewire.h>
 #include <pipewire/i18n.h>
 #include <pipewire/extensions/metadata.h>