From b3bd026699f8680d9bca565003cc08e2b52ca7b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Barnab=C3=A1s=20P=C5=91cze?= <pobrn@protonmail.com>
Date: Sun, 12 May 2024 17:17:08 +0200
Subject: [PATCH] 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           |  2 +-
 src/modules/module-access.c                   |  2 +-
 src/modules/module-protocol-native.c          |  2 +-
 src/modules/module-protocol-pulse/cmd.c       |  2 +-
 src/modules/module-protocol-pulse/module.c    |  2 +-
 .../module-protocol-pulse/pulse-server.c      |  2 +-
 src/modules/module-protocol-pulse/server.c    |  2 +-
 src/modules/module-raop-sink.c                |  2 +-
 src/modules/module-roc-sink.c                 |  1 -
 src/modules/module-roc-source.c               |  1 -
 src/modules/spa/module-device.c               |  1 -
 src/modules/spa/module-node-factory.c         |  1 -
 src/modules/spa/module-node.c                 |  1 -
 src/pipewire/cleanup.h                        | 21 -------------------
 src/pipewire/conf.c                           |  2 +-
 src/pipewire/filter.c                         |  2 +-
 src/pipewire/impl-device.c                    |  1 -
 src/pipewire/impl-metadata.c                  |  2 +-
 src/pipewire/impl-module.c                    |  2 +-
 src/pipewire/log.c                            |  1 -
 src/pipewire/pipewire.c                       |  1 -
 src/pipewire/properties.h                     |  5 +++++
 src/pipewire/stream.c                         |  2 +-
 src/pipewire/utils.h                          |  5 +++++
 src/tools/pw-cat.c                            |  1 -
 25 files changed, 23 insertions(+), 43 deletions(-)
 delete mode 100644 src/pipewire/cleanup.h

diff --git a/.gitlab/ci/check_missing_headers.sh b/.gitlab/ci/check_missing_headers.sh
index f00b3fca3..25bcc1f35 100755
--- a/.gitlab/ci/check_missing_headers.sh
+++ b/.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
diff --git a/src/modules/module-access.c b/src/modules/module-access.c
index 2c87f249d..9e06e567f 100644
--- a/src/modules/module-access.c
+++ b/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"
 
diff --git a/src/modules/module-protocol-native.c b/src/modules/module-protocol-native.c
index d27d39f05..fb5c91dbf 100644
--- a/src/modules/module-protocol-native.c
+++ b/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"
 
diff --git a/src/modules/module-protocol-pulse/cmd.c b/src/modules/module-protocol-pulse/cmd.c
index 5bdf0d613..0fcd83a98 100644
--- a/src/modules/module-protocol-pulse/cmd.c
+++ b/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"
diff --git a/src/modules/module-protocol-pulse/module.c b/src/modules/module-protocol-pulse/module.c
index 829a4ade6..4b9217a05 100644
--- a/src/modules/module-protocol-pulse/module.c
+++ b/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>
diff --git a/src/modules/module-protocol-pulse/pulse-server.c b/src/modules/module-protocol-pulse/pulse-server.c
index dfb5a2a9f..9f71060e3 100644
--- a/src/modules/module-protocol-pulse/pulse-server.c
+++ b/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>
 
diff --git a/src/modules/module-protocol-pulse/server.c b/src/modules/module-protocol-pulse/server.c
index ca9bbe32e..e35f25c32 100644
--- a/src/modules/module-protocol-pulse/server.c
+++ b/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"
diff --git a/src/modules/module-raop-sink.c b/src/modules/module-raop-sink.c
index 9ca034d29..70a8a5a2a 100644
--- a/src/modules/module-raop-sink.c
+++ b/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>
 
diff --git a/src/modules/module-roc-sink.c b/src/modules/module-roc-sink.c
index a93dbc782..06af90f47 100644
--- a/src/modules/module-roc-sink.c
+++ b/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>
 
diff --git a/src/modules/module-roc-source.c b/src/modules/module-roc-source.c
index aca3cd3e8..f9b1e8948 100644
--- a/src/modules/module-roc-source.c
+++ b/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>
 
diff --git a/src/modules/spa/module-device.c b/src/modules/spa/module-device.c
index d23ace783..a5e09ecf5 100644
--- a/src/modules/spa/module-device.c
+++ b/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"
diff --git a/src/modules/spa/module-node-factory.c b/src/modules/spa/module-node-factory.c
index cafb71e32..dbbc6d0b4 100644
--- a/src/modules/spa/module-node-factory.c
+++ b/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"
 
diff --git a/src/modules/spa/module-node.c b/src/modules/spa/module-node.c
index fac64dab1..9844607bc 100644
--- a/src/modules/spa/module-node.c
+++ b/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"
diff --git a/src/pipewire/cleanup.h b/src/pipewire/cleanup.h
deleted file mode 100644
index 6a54e363b..000000000
--- a/src/pipewire/cleanup.h
+++ /dev/null
@@ -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 */
diff --git a/src/pipewire/conf.c b/src/pipewire/conf.c
index cccfeb651..e108134fc 100644
--- a/src/pipewire/conf.c
+++ b/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>
 
diff --git a/src/pipewire/filter.c b/src/pipewire/filter.c
index 0bb8d8769..3d894a994 100644
--- a/src/pipewire/filter.c
+++ b/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"
diff --git a/src/pipewire/impl-device.c b/src/pipewire/impl-device.c
index 184bed38d..0a96baaf3 100644
--- a/src/pipewire/impl-device.c
+++ b/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);
diff --git a/src/pipewire/impl-metadata.c b/src/pipewire/impl-metadata.c
index c6f99373c..bb330881e 100644
--- a/src/pipewire/impl-metadata.c
+++ b/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"
 
diff --git a/src/pipewire/impl-module.c b/src/pipewire/impl-module.c
index 644bae92c..2388760db 100644
--- a/src/pipewire/impl-module.c
+++ b/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"
 
diff --git a/src/pipewire/log.c b/src/pipewire/log.c
index d15b3c0e9..c8410a6f5 100644
--- a/src/pipewire/log.c
+++ b/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);
 
diff --git a/src/pipewire/pipewire.c b/src/pipewire/pipewire.c
index e55d5321e..74545d619 100644
--- a/src/pipewire/pipewire.c
+++ b/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"
diff --git a/src/pipewire/properties.h b/src/pipewire/properties.h
index 86e7ae712..dec816a8d 100644
--- a/src/pipewire/properties.h
+++ b/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
diff --git a/src/pipewire/stream.c b/src/pipewire/stream.c
index 306105f7f..974d12b03 100644
--- a/src/pipewire/stream.c
+++ b/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"
diff --git a/src/pipewire/utils.h b/src/pipewire/utils.h
index 9889fd7f5..528f6764b 100644
--- a/src/pipewire/utils.h
+++ b/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
diff --git a/src/tools/pw-cat.c b/src/tools/pw-cat.c
index 8608c2e96..7e3c59600 100644
--- a/src/tools/pw-cat.c
+++ b/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>