From 4c73518d6efce66c2d05e94dd6f517f68a506d2e Mon Sep 17 00:00:00 2001 From: Steve Lhomme Date: Fri, 11 Mar 2022 08:11:13 +0100 Subject: [PATCH] libvlc: don't make VLC error reporting public anymore There's no reason for an app to mix its error messages with ours. Applications that may have used this will fail to link so will quickly notice the change. --- include/vlc/libvlc.h | 11 +---------- lib/error.c | 6 ++++-- lib/libvlc.sym | 2 -- 3 files changed, 5 insertions(+), 14 deletions(-) diff --git a/include/vlc/libvlc.h b/include/vlc/libvlc.h index 949d4a38f1..f488bdaf9b 100644 --- a/include/vlc/libvlc.h +++ b/include/vlc/libvlc.h @@ -98,15 +98,6 @@ LIBVLC_API const char *libvlc_errmsg (void); */ LIBVLC_API void libvlc_clearerr (void); -/** - * Sets the LibVLC error status and message for the current thread. - * Any previous error is overridden. - * \param fmt the format string - * \param ap the arguments - * \return a nul terminated string in any case - */ -LIBVLC_API const char *libvlc_vprinterr (const char *fmt, va_list ap); - /** * Sets the LibVLC error status and message for the current thread. * Any previous error is overridden. @@ -114,7 +105,7 @@ LIBVLC_API const char *libvlc_vprinterr (const char *fmt, va_list ap); * \param ... the arguments for the format string * \return a nul terminated string in any case */ -LIBVLC_API const char *libvlc_printerr (const char *fmt, ...); +const char *libvlc_printerr (const char *fmt, ...); /**@} */ diff --git a/lib/error.c b/lib/error.c index c0ea46067d..cb2b6f1804 100644 --- a/lib/error.c +++ b/lib/error.c @@ -97,9 +97,11 @@ void libvlc_clearerr (void) /** * Sets the LibVLC error status and message for the current thread. * Any previous error is overridden. - * @return a nul terminated string (always) + * \param fmt the format string + * \param ap the arguments + * \return a nul terminated string in any case */ -const char *libvlc_vprinterr (const char *fmt, va_list ap) +static const char *libvlc_vprinterr (const char *fmt, va_list ap) { char *msg; diff --git a/lib/libvlc.sym b/lib/libvlc.sym index 73fa2bb0d1..aaedeec631 100644 --- a/lib/libvlc.sym +++ b/lib/libvlc.sym @@ -1,7 +1,5 @@ libvlc_errmsg libvlc_clearerr -libvlc_printerr -libvlc_vprinterr libvlc_add_intf libvlc_audio_equalizer_get_amp_at_index libvlc_audio_equalizer_get_band_count