mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-28 20:51:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

reporter: Fix proper debug message output partially

Browse source 
In order for the special gstreamer print argument handler to be used
you can't use g_strdup_printf. You need to pass it the actual va_list.
This commit is contained in:
Edward Hervey 2013-08-16 14:27:29 +02:00
parent 501be30379
commit 3e5c921217
1 changed files with 21 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
validate/gst/validate/gst-validate-reporter.c
View file

@ -94,7 +94,8 @@ gst_validate_report_valist (GstValidateReporter * reporter,
GstValidateIssueId issue_id, const gchar * format, va_list var_args)
{
GstValidateReport *report;
gchar *message;
gchar *message, *combo;
va_list vacopy;
GstValidateIssue *issue;
GstValidateReporterPrivate *priv = gst_validate_reporter_get_priv (reporter);
@ -102,7 +103,8 @@ gst_validate_report_valist (GstValidateReporter * reporter,
g_return_if_fail (issue != NULL);
message = g_strdup_vprintf (format, var_args);
G_VA_COPY (vacopy, var_args);
message = g_strdup_vprintf (format, vacopy);
report = gst_validate_report_new (issue, reporter, message);
gst_validate_reporter_intercept_report (reporter, report);
@ -120,17 +122,28 @@ gst_validate_report_valist (GstValidateReporter * reporter,
g_hash_table_insert (priv->reports, (gpointer) issue_id, report);
}
combo = g_strdup_printf ("<%s>:%s", priv->name, format);
G_VA_COPY (vacopy, var_args);
if (report->level == GST_VALIDATE_REPORT_LEVEL_CRITICAL)
GST_ERROR ("<%s>: %s", priv->name, message);
gst_debug_log_valist (GST_CAT_DEFAULT, GST_LEVEL_ERROR, __FILE__,
GST_FUNCTION, __LINE__, NULL, combo, vacopy);
else if (report->level == GST_VALIDATE_REPORT_LEVEL_WARNING)
GST_WARNING ("<%s>: %s", priv->name, message);
gst_debug_log_valist (GST_CAT_DEFAULT, GST_LEVEL_WARNING, __FILE__,
GST_FUNCTION, __LINE__, NULL, combo, vacopy);
else if (report->level == GST_VALIDATE_REPORT_LEVEL_ISSUE)
GST_LOG ("<%s>: %s", priv->name, message);
gst_debug_log_valist (GST_CAT_DEFAULT, GST_LEVEL_LOG, __FILE__,
GST_FUNCTION, __LINE__, (GObject *) NULL, combo, vacopy);
else
GST_DEBUG ("<%s>: %s", priv->name, message);
gst_debug_log_valist (GST_CAT_DEFAULT, GST_LEVEL_DEBUG, __FILE__,
GST_FUNCTION, __LINE__, NULL, combo, vacopy);
GST_INFO_OBJECT (reporter, "Received error report %" GST_VALIDATE_ISSUE_FORMAT
" : %s", GST_VALIDATE_ISSUE_ARGS (issue), message);
g_free (combo);
combo = g_strdup_printf ("Received error report %" GST_VALIDATE_ISSUE_FORMAT
" : %s", GST_VALIDATE_ISSUE_ARGS (issue), format);
G_VA_COPY (vacopy, var_args);
gst_debug_log_valist (GST_CAT_DEFAULT, GST_LEVEL_DEBUG, __FILE__,
GST_FUNCTION, __LINE__, NULL, combo, vacopy);
gst_validate_report_printf (report);
gst_validate_report_check_abort (report);