gst/gstinfo.h: Add GST_STR_NULL to the second string.

Original commit message from CVS:
2006-02-19  Julien MOUTTE  <julien@moutte.net>

* 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.
This commit is contained in:
Julien Moutte 2006-02-19 12:25:01 +00:00
parent 3eb3b1c742
commit 34a3b80747
3 changed files with 13 additions and 9 deletions

View file

@ -1,3 +1,11 @@
2006-02-19 Julien MOUTTE <julien@moutte.net>
* 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 <sebastien@moutte.net>
* gst/gstpad.c: (gst_pad_set_event_function),

View file

@ -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:

View file

@ -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));
}
/**