From d75a69ec951949962ee5a3df3f136452e8712a88 Mon Sep 17 00:00:00 2001 From: Jordan Petridis Date: Thu, 28 Jan 2021 08:40:56 +0200 Subject: [PATCH] gstinfo: remove the vasprintf fallback We are always building our printf implementation, even when GST_DEBUG is disabled, since we are exposing api (gst_print*) that's dependant on our printf behavior. We don't need to keep __gst_info_fallback_vasprintf around anymore. Close #640 Part-of: --- subprojects/gstreamer/gst/gst_private.h | 6 ---- subprojects/gstreamer/gst/gstelement.c | 2 -- subprojects/gstreamer/gst/gstinfo.c | 49 ++------------------------------- 3 files changed, 2 insertions(+), 55 deletions(-) diff --git a/subprojects/gstreamer/gst/gst_private.h b/subprojects/gstreamer/gst/gst_private.h index d775cd3..0841836 100644 --- a/subprojects/gstreamer/gst/gst_private.h +++ b/subprojects/gstreamer/gst/gst_private.h @@ -348,12 +348,6 @@ extern GstClockTime _priv_gst_start_time; #endif -#ifdef GST_DISABLE_GST_DEBUG -/* for _gst_element_error_printf */ -#define __gst_vasprintf __gst_info_fallback_vasprintf -int __gst_vasprintf (char **result, char const *format, va_list args); -#endif - /**** objects made opaque until the private bits have been made private ****/ #include diff --git a/subprojects/gstreamer/gst/gstelement.c b/subprojects/gstreamer/gst/gstelement.c index ccd07fd..346ea67 100644 --- a/subprojects/gstreamer/gst/gstelement.c +++ b/subprojects/gstreamer/gst/gstelement.c @@ -104,9 +104,7 @@ #include #include "glib-compat-private.h" -#ifndef GST_DISABLE_GST_DEBUG #include "printf/printf.h" -#endif /* Element signals and args */ enum diff --git a/subprojects/gstreamer/gst/gstinfo.c b/subprojects/gstreamer/gst/gstinfo.c index 0ed428d..fec6c9e 100644 --- a/subprojects/gstreamer/gst/gstinfo.c +++ b/subprojects/gstreamer/gst/gstinfo.c @@ -109,6 +109,8 @@ #ifdef HAVE_VALGRIND_VALGRIND_H # include #endif +#endif /* GST_DISABLE_GST_DEBUG */ + #include /* g_sprintf */ /* our own printf implementation with custom extensions to %p for caps etc. */ @@ -117,10 +119,6 @@ static char *gst_info_printf_pointer_extension_func (const char *format, void *ptr); -#else /* GST_DISABLE_GST_DEBUG */ - -#include -#endif /* !GST_DISABLE_GST_DEBUG */ #ifdef HAVE_UNISTD_H # include /* getpid on UNIX */ @@ -2598,46 +2596,6 @@ _gst_debug_dump_mem (GstDebugCategory * cat, const gchar * file, #endif /* GST_REMOVE_DISABLED */ #endif /* GST_DISABLE_GST_DEBUG */ -/* Need this for _gst_element_error_printf even if GST_REMOVE_DISABLED is set: - * fallback function that cleans up the format string and replaces all pointer - * extension formats with plain %p. */ -#ifdef GST_DISABLE_GST_DEBUG -int -__gst_info_fallback_vasprintf (char **result, char const *format, va_list args) -{ - gchar *clean_format, *c; - gsize len; - - if (format == NULL) - return -1; - - clean_format = g_strdup (format); - c = clean_format; - while ((c = strstr (c, "%p\a"))) { - if (c[3] < 'A' || c[3] > 'Z') { - c += 3; - continue; - } - len = strlen (c + 4); - memmove (c + 2, c + 4, len + 1); - c += 2; - } - while ((c = strstr (clean_format, "%P"))) /* old GST_PTR_FORMAT */ - c[1] = 'p'; - while ((c = strstr (clean_format, "%Q"))) /* old GST_SEGMENT_FORMAT */ - c[1] = 'p'; - - len = g_vasprintf (result, clean_format, args); - - g_free (clean_format); - - if (*result == NULL) - return -1; - - return len; -} -#endif - /** * gst_info_vasprintf: * @result: (out): the resulting string @@ -2661,9 +2619,6 @@ __gst_info_fallback_vasprintf (char **result, char const *format, va_list args) gint gst_info_vasprintf (gchar ** result, const gchar * format, va_list args) { - /* This will fallback to __gst_info_fallback_vasprintf() via a #define in - * gst_private.h if the debug system is disabled which will remove the gst - * specific printf format specifiers */ return __gst_vasprintf (result, format, args); } -- 2.7.4