diff options
author | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2011-02-24 17:11:49 +0000 |
---|---|---|
committer | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2011-02-24 17:12:00 +0000 |
commit | d3e79815278f451423a9d8c6165ad4715a5b1d97 (patch) | |
tree | 7e5df4b371f154f36ccd80060480fee8d9cb631d /gst | |
parent | 1f59906ec1a20645b1c299e835fa2d14c197b5eb (diff) |
uri: make win32 buildbot happy
gsturi.c:854:16: error: unused variable 'abs_clean'
gsturi.c:788:1: error: 'gst_file_utils_canonicalise_path' defined but not used
Diffstat (limited to 'gst')
-rw-r--r-- | gst/gsturi.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/gst/gsturi.c b/gst/gsturi.c index 76a1f8767..0f5bbbb4f 100644 --- a/gst/gsturi.c +++ b/gst/gsturi.c @@ -789,6 +789,13 @@ gst_file_utils_canonicalise_path (const gchar * path) { gchar **parts, **p, *clean_path; +#ifdef G_OS_WIN32 + { + GST_WARNING ("FIXME: canonicalise win32 path"); + return g_strdup (path); + } +#endif + parts = g_strsplit (path, "/", -1); p = parts; @@ -877,15 +884,10 @@ gst_filename_to_uri (const gchar * filename, GError ** error) } /* path is now absolute, but contains '.' or '..' */ -#ifndef G_OS_WIN32 abs_clean = gst_file_utils_canonicalise_path (abs_location); GST_LOG ("'%s' -> '%s' -> '%s'", filename, abs_location, abs_clean); uri = g_filename_to_uri (abs_clean, NULL, error); g_free (abs_clean); -#else - GST_WARNING ("FIXME: canonicalise win32 path"); - uri = g_filename_to_uri (abs_location, NULL, error); -#endif beach: |