mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-04-26 06:54:49 +00:00
Escape filenames for display in error messages.
Original commit message from CVS: Escape filenames for display in error messages.
This commit is contained in:
parent
18731001f6
commit
1574cf765f
1 changed files with 15 additions and 3 deletions
|
@ -507,10 +507,14 @@ static int audiocast_init(GstGnomeVFSSrc *src)
|
||||||
GST_DEBUG ("audiocast: registering listener");
|
GST_DEBUG ("audiocast: registering listener");
|
||||||
if (audiocast_register_listener(&src->audiocast_port, &src->audiocast_fd) < 0)
|
if (audiocast_register_listener(&src->audiocast_port, &src->audiocast_fd) < 0)
|
||||||
{
|
{
|
||||||
|
char *escaped;
|
||||||
|
|
||||||
|
escaped = gnome_vfs_unescape_string_for_display (src->filename);
|
||||||
gst_element_error(GST_ELEMENT(src),
|
gst_element_error(GST_ELEMENT(src),
|
||||||
"opening vfs file \"%s\" (%s)",
|
"opening vfs file \"%s\" (%s)",
|
||||||
src->filename,
|
escaped,
|
||||||
"unable to register UDP port");
|
"unable to register UDP port");
|
||||||
|
g_free (escaped);
|
||||||
close(src->audiocast_fd);
|
close(src->audiocast_fd);
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
@ -526,10 +530,13 @@ static int audiocast_init(GstGnomeVFSSrc *src)
|
||||||
GST_DEBUG ("audiocast: creating audiocast thread");
|
GST_DEBUG ("audiocast: creating audiocast thread");
|
||||||
src->audiocast_thread = g_thread_create((GThreadFunc) audiocast_thread_run, src, TRUE, &error);
|
src->audiocast_thread = g_thread_create((GThreadFunc) audiocast_thread_run, src, TRUE, &error);
|
||||||
if (error != NULL) {
|
if (error != NULL) {
|
||||||
|
char *escaped;
|
||||||
|
escaped = gnome_vfs_unescape_string_for_display (src->filename);
|
||||||
gst_element_error(GST_ELEMENT(src),
|
gst_element_error(GST_ELEMENT(src),
|
||||||
"opening vfs file \"%s\" (unable to create thread: %s)",
|
"opening vfs file \"%s\" (unable to create thread: %s)",
|
||||||
src->filename,
|
escaped,
|
||||||
error->message);
|
error->message);
|
||||||
|
g_free (escaped);
|
||||||
close(src->audiocast_fd);
|
close(src->audiocast_fd);
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
@ -1048,12 +1055,17 @@ static gboolean gst_gnomevfssrc_open_file(GstGnomeVFSSrc *src)
|
||||||
GNOME_VFS_OPEN_READ);
|
GNOME_VFS_OPEN_READ);
|
||||||
if (result != GNOME_VFS_OK)
|
if (result != GNOME_VFS_OK)
|
||||||
{
|
{
|
||||||
|
char *escaped;
|
||||||
|
|
||||||
gst_gnomevfssrc_pop_callbacks (src);
|
gst_gnomevfssrc_pop_callbacks (src);
|
||||||
audiocast_thread_kill(src);
|
audiocast_thread_kill(src);
|
||||||
|
|
||||||
|
escaped = gnome_vfs_unescape_string_for_display (src->filename);
|
||||||
gst_element_error(GST_ELEMENT(src),
|
gst_element_error(GST_ELEMENT(src),
|
||||||
"opening vfs file \"%s\" (%s)",
|
"opening vfs file \"%s\" (%s)",
|
||||||
src->filename,
|
escaped,
|
||||||
gnome_vfs_result_to_string(result));
|
gnome_vfs_result_to_string(result));
|
||||||
|
g_free (escaped);
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue