[vlc-devel] commit: freetype: NULL for %s is not portable ( Rémi Denis-Courmont )

[git version control]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Dec 26 14:29:08 2009 +0200| [b20b1a2734e994561182770281bad9eee5a38bb1] | committer: Rémi Denis-Courmont 

freetype: NULL for %s is not portable

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b20b1a2734e994561182770281bad9eee5a38bb1
---

 modules/misc/freetype.c |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/modules/misc/freetype.c b/modules/misc/freetype.c
index b78da48..ce3b63f 100644
--- a/modules/misc/freetype.c
+++ b/modules/misc/freetype.c
@@ -427,7 +427,8 @@ static int Create( vlc_object_t *p_this )
         goto error;
     }
 
-    msg_Dbg( p_filter, "Using %s as font from file %s", psz_fontfamily, psz_fontfile );
+    msg_Dbg( p_filter, "Using %s as font from file %s", psz_fontfamily,
+             psz_fontfile ? psz_fontfile : "(null)" );
     p_sys->psz_fontfamily = strdup( psz_fontfamily );
 # ifdef WIN32
     if( p_dialog )
@@ -458,12 +459,14 @@ static int Create( vlc_object_t *p_this )
 
     if( i_error == FT_Err_Unknown_File_Format )
     {
-        msg_Err( p_filter, "file %s have unknown format", psz_fontfile );
+        msg_Err( p_filter, "file %s have unknown format",
+                 psz_fontfile ? psz_fontfile : "(null)" );
         goto error;
     }
     else if( i_error )
     {
-        msg_Err( p_filter, "failed to load font file %s", psz_fontfile );
+        msg_Err( p_filter, "failed to load font file %s",
+                 psz_fontfile ? psz_fontfile : "(null)" );
         goto error;
     }