From 34a3b807477c258fe1db0fac83da5325d43044f0 Mon Sep 17 00:00:00 2001 From: Julien Moutte Date: Sun, 19 Feb 2006 12:25:01 +0000 Subject: [PATCH] gst/gstinfo.h: Add GST_STR_NULL to the second string. Original commit message from CVS: 2006-02-19 Julien MOUTTE * gst/gstinfo.h: Add GST_STR_NULL to the second string. * gst/gstpad.c: (gst_pad_set_event_function), (gst_pad_set_query_function), (gst_pad_set_query_type_function), (gst_pad_set_getcaps_function): GST_DEBUG_PAD_NAME evaluates to 2 strings. You can't use the STR_NULL macro on that. --- ChangeLog | 8 ++++++++ gst/gstinfo.h | 2 +- gst/gstpad.c | 12 ++++-------- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6b6c8bb..4f66cf2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2006-02-19 Julien MOUTTE + + * gst/gstinfo.h: Add GST_STR_NULL to the second string. + * gst/gstpad.c: (gst_pad_set_event_function), + (gst_pad_set_query_function), (gst_pad_set_query_type_function), + (gst_pad_set_getcaps_function): GST_DEBUG_PAD_NAME evaluates to + 2 strings. You can't use the STR_NULL macro on that. + 2006-02-19 Sebastien Moutte * gst/gstpad.c: (gst_pad_set_event_function), diff --git a/gst/gstinfo.h b/gst/gstinfo.h index 1030eda..11dcdd6 100644 --- a/gst/gstinfo.h +++ b/gst/gstinfo.h @@ -189,7 +189,7 @@ struct _GstDebugCategory { ((GST_OBJECT_PARENT(pad) != NULL) ? \ GST_STR_NULL (GST_OBJECT_NAME (GST_OBJECT_PARENT(pad))) : \ "''" ) : "''", \ - (pad != NULL) ? GST_OBJECT_NAME (pad) : "''" + (pad != NULL) ? GST_STR_NULL (GST_OBJECT_NAME (pad)) : "''" /** * GST_FUNCTION: diff --git a/gst/gstpad.c b/gst/gstpad.c index ac3a952..82ee1d6 100644 --- a/gst/gstpad.c +++ b/gst/gstpad.c @@ -1113,8 +1113,7 @@ gst_pad_set_event_function (GstPad * pad, GstPadEventFunction event) GST_PAD_EVENTFUNC (pad) = event; GST_CAT_DEBUG (GST_CAT_PADS, "eventfunc for %s:%s set to %s", - GST_STR_NULL (GST_DEBUG_PAD_NAME (pad)), - GST_STR_NULL (GST_DEBUG_FUNCPTR_NAME (event))); + GST_DEBUG_PAD_NAME (pad), GST_DEBUG_FUNCPTR_NAME (event)); } /** @@ -1132,8 +1131,7 @@ gst_pad_set_query_function (GstPad * pad, GstPadQueryFunction query) GST_PAD_QUERYFUNC (pad) = query; GST_CAT_DEBUG (GST_CAT_PADS, "queryfunc for %s:%s set to %s", - GST_STR_NULL (GST_DEBUG_PAD_NAME (pad)), - GST_STR_NULL (GST_DEBUG_FUNCPTR_NAME (query))); + GST_DEBUG_PAD_NAME (pad), GST_DEBUG_FUNCPTR_NAME (query)); } /** @@ -1152,8 +1150,7 @@ gst_pad_set_query_type_function (GstPad * pad, GST_PAD_QUERYTYPEFUNC (pad) = type_func; GST_CAT_DEBUG (GST_CAT_PADS, "querytypefunc for %s:%s set to %s", - GST_STR_NULL (GST_DEBUG_PAD_NAME (pad)), - GST_STR_NULL (GST_DEBUG_FUNCPTR_NAME (type_func))); + GST_DEBUG_PAD_NAME (pad), GST_DEBUG_FUNCPTR_NAME (type_func)); } /** @@ -1309,8 +1306,7 @@ gst_pad_set_getcaps_function (GstPad * pad, GstPadGetCapsFunction getcaps) GST_PAD_GETCAPSFUNC (pad) = getcaps; GST_CAT_DEBUG (GST_CAT_PADS, "getcapsfunc for %s:%s set to %s", - GST_STR_NULL (GST_DEBUG_PAD_NAME (pad)), - GST_STR_NULL (GST_DEBUG_FUNCPTR_NAME (getcaps))); + GST_DEBUG_PAD_NAME (pad), GST_DEBUG_FUNCPTR_NAME (getcaps)); } /** -- 2.7.4