[gst-cvs] oleavr gstreamer: gstreamer/ gstreamer/gst/

[<ol...@ke...>]

CVS Root:       /cvs/gstreamer
Module:         gstreamer
Changes by:     oleavr
Date:           Wed May 07 2008  19:24:59 UTC

Log message:
	* gst/gstinfo.c (gst_debug_log_valist):
	  Improved the __FILE__ part of debug output for MSVC.

Modified files:
    .               : ChangeLog
    gst             : gstinfo.c

Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/ChangeLog.diff?r1=1.3837&r2=1.3838
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gstinfo.c.diff?r1=1.146&r2=1.147

====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/gstreamer/ChangeLog,v
retrieving revision 1.3837
retrieving revision 1.3838
diff -u -d -r1.3837 -r1.3838
--- ChangeLog	7 May 2008 19:15:12 -0000	1.3837
+++ ChangeLog	7 May 2008 19:24:43 -0000	1.3838
@@ -1,5 +1,10 @@
 2008-05-07  Ole André Vadla Ravnås  <ole.andre.ravnas at tandberg com>
 
+	* gst/gstinfo.c (gst_debug_log_valist):
+	  Improved the __FILE__ part of debug output for MSVC.
+
+2008-05-07  Ole André Vadla Ravnås  <ole.andre.ravnas at tandberg com>
 	* libs/gst/base/gstbasesrc.c (gst_base_src_default_query):
 	  Declaration after statement fix for compilers like MSVC.
Index: gstinfo.c
RCS file: /cvs/gstreamer/gstreamer/gst/gstinfo.c,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -d -r1.146 -r1.147
--- gstinfo.c	3 May 2008 19:08:50 -0000	1.146
+++ gstinfo.c	7 May 2008 19:24:44 -0000	1.147
@@ -412,11 +412,24 @@
   LogFuncEntry *entry;
   GSList *handler;
+#ifdef _MSC_VER
+  gchar *file_basename;
+#endif
   g_return_if_fail (category != NULL);
   g_return_if_fail (file != NULL);
   g_return_if_fail (function != NULL);
   g_return_if_fail (format != NULL);
+  /*
+   * The predefined macro __FILE__ is always the exact path given to the
+   * compiler with MSVC, which may or may not be the basename.  We work
+   * around it at runtime to improve the readability.
+   */
+  file = file_basename = g_path_get_basename (file);
   message.message = NULL;
   message.format = format;
   G_VA_COPY (message.arguments, args);
@@ -430,6 +443,10 @@
   }
   g_free (message.message);
   va_end (message.arguments);
+  g_free (file_basename);
 }
 /**