[gst-cvs] gstreamer: dot-dump: terminate truncated strings and escape special chars

Stefan Kost ensonic at kemper.freedesktop.org
Fri Jun 25 11:28:58 PDT 2010


Module: gstreamer
Branch: master
Commit: 8fffa2d790aa591294195457a69b3e265d266613
URL:    http://cgit.freedesktop.org/gstreamer/gstreamer/commit/?id=8fffa2d790aa591294195457a69b3e265d266613

Author: Stefan Kost <ensonic at users.sf.net>
Date:   Fri Jun 25 21:23:22 2010 +0300

dot-dump: terminate truncated strings and escape special chars

Fixes syntax errors in generated dot files for caps with strings.

---

 gst/gstdebugutils.c |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/gst/gstdebugutils.c b/gst/gstdebugutils.c
index 58a3cb1..3bca9f7 100644
--- a/gst/gstdebugutils.c
+++ b/gst/gstdebugutils.c
@@ -234,6 +234,7 @@ string_append_field (GQuark field, const GValue * value, gpointer ptr)
 {
   GString *str = (GString *) ptr;
   gchar *value_str = gst_value_serialize (value);
+  gchar *esc_value_str;
 
   /* some enums can become really long */
   if (strlen (value_str) > 25) {
@@ -242,7 +243,7 @@ string_append_field (GQuark field, const GValue * value, gpointer ptr)
     /* truncate */
     value_str[25] = '\0';
 
-    /* mirror any brackets */
+    /* mirror any brackets and quotes */
     if (value_str[0] == '<')
       value_str[pos--] = '>';
     if (value_str[0] == '[')
@@ -251,6 +252,8 @@ string_append_field (GQuark field, const GValue * value, gpointer ptr)
       value_str[pos--] = ')';
     if (value_str[0] == '{')
       value_str[pos--] = '}';
+    if (value_str[0] == '"')
+      value_str[pos--] = '"';
     if (pos != 24)
       value_str[pos--] = ' ';
     /* elippsize */
@@ -258,10 +261,13 @@ string_append_field (GQuark field, const GValue * value, gpointer ptr)
     value_str[pos--] = '.';
     value_str[pos--] = '.';
   }
+  esc_value_str = g_strescape (value_str, NULL);
+
   g_string_append_printf (str, "  %18s: %s\\l", g_quark_to_string (field),
-      value_str);
+      esc_value_str);
 
   g_free (value_str);
+  g_free (esc_value_str);
   return TRUE;
 }
 





More information about the Gstreamer-commits mailing list