From 77313f73a2cabb9e71ff74e643bf4844759d25ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kacper=20Michaj=C5=82ow?= Date: Sat, 22 Feb 2025 07:25:55 +0100 Subject: [PATCH] various: reduce the include scope of some public headers --- common/stats.c | 2 ++ fuzzers/fuzzer_load.c | 2 -- fuzzers/fuzzer_loadfile_direct.c | 2 -- fuzzers/fuzzer_set_property.c | 2 -- input/input.c | 2 ++ input/ipc.c | 2 ++ misc/json.c | 2 ++ misc/json.h | 4 +--- misc/node.c | 9 ++++++--- misc/node.h | 15 +++++++++------ player/client.h | 1 - player/core.h | 2 -- player/loadfile.c | 1 - test/json.c | 2 ++ test/libmpv_common.h | 3 ++- test/libmpv_encode.c | 3 ++- 16 files changed, 30 insertions(+), 24 deletions(-) diff --git a/common/stats.c b/common/stats.c index 5ac0d870b7..3bf662d766 100644 --- a/common/stats.c +++ b/common/stats.c @@ -1,6 +1,8 @@ #include #include +#include + #include "common.h" #include "global.h" #include "misc/linked_list.h" diff --git a/fuzzers/fuzzer_load.c b/fuzzers/fuzzer_load.c index ca0a653b5d..39075fb90f 100644 --- a/fuzzers/fuzzer_load.c +++ b/fuzzers/fuzzer_load.c @@ -23,8 +23,6 @@ #include #include -#include - #include "common.h" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) diff --git a/fuzzers/fuzzer_loadfile_direct.c b/fuzzers/fuzzer_loadfile_direct.c index f6dd35c341..be2fb1110d 100644 --- a/fuzzers/fuzzer_loadfile_direct.c +++ b/fuzzers/fuzzer_loadfile_direct.c @@ -20,8 +20,6 @@ #include -#include - #include "common.h" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) diff --git a/fuzzers/fuzzer_set_property.c b/fuzzers/fuzzer_set_property.c index 210b36d041..04bda40623 100644 --- a/fuzzers/fuzzer_set_property.c +++ b/fuzzers/fuzzer_set_property.c @@ -15,8 +15,6 @@ * License along with mpv. If not, see . */ -#include - #include "common.h" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) diff --git a/input/input.c b/input/input.c index 252407952a..49fa7dbf63 100644 --- a/input/input.c +++ b/input/input.c @@ -28,6 +28,8 @@ #include #include +#include + #include "osdep/io.h" #include "misc/rendezvous.h" diff --git a/input/ipc.c b/input/ipc.c index ea69fb7c24..d1347f586e 100644 --- a/input/ipc.c +++ b/input/ipc.c @@ -15,6 +15,8 @@ * License along with mpv. If not, see . */ +#include + #include "common/msg.h" #include "input/input.h" #include "misc/json.h" diff --git a/misc/json.c b/misc/json.c index efe5061521..71587004ca 100644 --- a/misc/json.c +++ b/misc/json.c @@ -48,6 +48,8 @@ #include #include +#include + #include "common/common.h" #include "misc/bstr.h" #include "misc/ctype.h" diff --git a/misc/json.h b/misc/json.h index 467beb9d26..ec59c21443 100644 --- a/misc/json.h +++ b/misc/json.h @@ -18,12 +18,10 @@ #ifndef MP_JSON_H #define MP_JSON_H -// We reuse mpv_node. -#include "libmpv/client.h" - #define MAX_JSON_DEPTH 50 struct bstr; +struct mpv_node; int json_parse(void *ta_parent, struct mpv_node *dst, char **src, int max_depth); int json_append(struct bstr *b, const struct mpv_node *src, int indent); diff --git a/misc/node.c b/misc/node.c index 1270d0f0d1..52183381b3 100644 --- a/misc/node.c +++ b/misc/node.c @@ -1,7 +1,10 @@ -#include "common/common.h" - #include "node.h" +#include + +#include "common/common.h" +#include "bstr.h" + // Init a node with the given format. If parent is not NULL, it is set as // parent allocation according to m_option_type_node rules (which means // the mpv_node_list allocs are used for chaining the TA allocations). @@ -117,7 +120,7 @@ mpv_node *node_map_bget(mpv_node *src, struct bstr key) // Note: for MPV_FORMAT_NODE_MAP, this (incorrectly) takes the order into // account, instead of treating it as set. -bool equal_mpv_value(const void *a, const void *b, mpv_format format) +bool equal_mpv_value(const void *a, const void *b, int format) { switch (format) { case MPV_FORMAT_NONE: diff --git a/misc/node.h b/misc/node.h index a858ffff11..f9bc3e797e 100644 --- a/misc/node.h +++ b/misc/node.h @@ -1,21 +1,24 @@ #ifndef MP_MISC_NODE_H_ #define MP_MISC_NODE_H_ -#include "libmpv/client.h" -#include "misc/bstr.h" +#include +#include + +struct bstr; +struct mpv_node; void node_init(struct mpv_node *dst, int format, struct mpv_node *parent); struct mpv_node *node_array_add(struct mpv_node *dst, int format); struct mpv_node *node_map_add(struct mpv_node *dst, const char *key, int format); struct mpv_node *node_map_badd(struct mpv_node *dst, struct bstr key, int format); void node_map_add_string(struct mpv_node *dst, const char *key, const char *val); -void node_map_add_bstr(struct mpv_node *dst, const char *key, bstr val); +void node_map_add_bstr(struct mpv_node *dst, const char *key, struct bstr val); void node_map_add_int64(struct mpv_node *dst, const char *key, int64_t v); void node_map_add_double(struct mpv_node *dst, const char *key, double v); void node_map_add_flag(struct mpv_node *dst, const char *key, bool v); -mpv_node *node_map_get(mpv_node *src, const char *key); -mpv_node *node_map_bget(mpv_node *src, struct bstr key); -bool equal_mpv_value(const void *a, const void *b, mpv_format format); +struct mpv_node *node_map_get(struct mpv_node *src, const char *key); +struct mpv_node *node_map_bget(struct mpv_node *src, struct bstr key); +bool equal_mpv_value(const void *a, const void *b, int format); bool equal_mpv_node(const struct mpv_node *a, const struct mpv_node *b); #endif diff --git a/player/client.h b/player/client.h index ddc568e975..a46bc451b6 100644 --- a/player/client.h +++ b/player/client.h @@ -4,7 +4,6 @@ #include #include -#include "libmpv/client.h" #include "libmpv/stream_cb.h" #include "misc/bstr.h" diff --git a/player/core.h b/player/core.h index b1b6c5f935..c77b14e51b 100644 --- a/player/core.h +++ b/player/core.h @@ -21,8 +21,6 @@ #include #include -#include "libmpv/client.h" - #include "audio/aframe.h" #include "clipboard/clipboard.h" #include "common/common.h" diff --git a/player/loadfile.c b/player/loadfile.c index 096ca89cca..bbb7c88ca3 100644 --- a/player/loadfile.c +++ b/player/loadfile.c @@ -60,7 +60,6 @@ #include "core.h" #include "command.h" -#include "libmpv/client.h" // Called from the demuxer thread if a new packet is available, or other changes. static void wakeup_demux(void *pctx) diff --git a/test/json.c b/test/json.c index 8aeae2326e..3ee1b9d8b5 100644 --- a/test/json.c +++ b/test/json.c @@ -1,3 +1,5 @@ +#include + #include "misc/json.h" #include "misc/node.h" #include "test_utils.h" diff --git a/test/libmpv_common.h b/test/libmpv_common.h index 4e702b8f92..bfc86204e9 100644 --- a/test/libmpv_common.h +++ b/test/libmpv_common.h @@ -16,13 +16,14 @@ */ #include -#include #include #include #include #include #include +#include + // Stolen from osdep/compiler.h #ifdef __GNUC__ #define PRINTF_ATTRIBUTE(a1, a2) __attribute__ ((format(printf, a1, a2))) diff --git a/test/libmpv_encode.c b/test/libmpv_encode.c index b447e43e3f..b44f7d8d47 100644 --- a/test/libmpv_encode.c +++ b/test/libmpv_encode.c @@ -16,7 +16,6 @@ */ #include -#include #include #include #include @@ -29,6 +28,8 @@ #include #endif +#include + // Stolen from osdep/compiler.h #ifdef __GNUC__ #define PRINTF_ATTRIBUTE(a1, a2) __attribute__ ((format(printf, a1, a2)))