changeset 2787:e35538325145 trunk

[svn] - add some assertions to chardet_to_utf8() to try to trace bad g_convert() calls
author nenolod
date Wed, 23 May 2007 15:45:00 -0700
parents c539e972b514
children b2b920b165ad
files ChangeLog src/audacious/build_stamp.c src/audacious/strings.c
diffstat 3 files changed, 12 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Tue May 22 16:55:33 2007 -0700
+++ b/ChangeLog	Wed May 23 15:45:00 2007 -0700
@@ -1,3 +1,11 @@
+2007-05-22 23:55:33 +0000  Yoshiki Yazawa <yaz@cc.rim.or.jp>
+  revision [4598]
+  - reduce startup time.
+  
+  trunk/src/audacious/main.c |    6 ++----
+  1 file changed, 2 insertions(+), 4 deletions(-)
+
+
 2007-05-22 22:17:15 +0000  Yoshiki Yazawa <yaz@cc.rim.or.jp>
   revision [4596]
   - implement some audacious-remote functions.
--- a/src/audacious/build_stamp.c	Tue May 22 16:55:33 2007 -0700
+++ b/src/audacious/build_stamp.c	Wed May 23 15:45:00 2007 -0700
@@ -1,2 +1,2 @@
 #include <glib.h>
-const gchar *svn_stamp = "20070522-4596";
+const gchar *svn_stamp = "20070522-4598";
--- a/src/audacious/strings.c	Tue May 22 16:55:33 2007 -0700
+++ b/src/audacious/strings.c	Wed May 23 15:45:00 2007 -0700
@@ -194,8 +194,7 @@
     gchar *out_str;
 
     /* NULL in NULL out */
-    if (!str)
-        return NULL;
+    g_return_val_if_fail(str != NULL, NULL);
 
     /* Note: Currently, playlist calls this function repeatedly, even
      * if the string is already converted into utf-8.
@@ -278,6 +277,8 @@
 	bytes_write = arg_bytes_write ? arg_bytes_write : &my_bytes_write;
 	error       = arg_error ? arg_error : NULL;
 
+	g_return_val_if_fail(str != NULL, NULL);
+
 #ifdef USE_CHARDET
 	if(cfg.chardet_detector)
 		det = cfg.chardet_detector;