From 228eccdbdf8cb8e599cc94667a7291d669951de6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Sebastian=20Dr=C3=B6ge?= Date: Thu, 8 May 2014 22:49:33 +0200 Subject: [PATCH] gldisplay: Use GST_STR_NULL() for printing possibly NULL strings and print all variables we use Fixes compiler warning about set but not used platform_choice variable among other things. --- gst-libs/gst/gl/gstgldisplay.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gst-libs/gst/gl/gstgldisplay.c b/gst-libs/gst/gl/gstgldisplay.c index 3c07cf4..ad1e79f 100644 --- a/gst-libs/gst/gl/gstgldisplay.c +++ b/gst-libs/gst/gl/gstgldisplay.c @@ -123,7 +123,8 @@ gst_gl_display_new (void) user_choice = g_getenv ("GST_GL_WINDOW"); platform_choice = g_getenv ("GST_GL_PLATFORM"); - GST_INFO ("creating a window, user choice:%s", user_choice); + GST_INFO ("creating a display, user choice:%s (platform: %s)", + GST_STR_NULL (user_choice), GST_STR_NULL (platform_choice)); #if GST_GL_HAVE_WINDOW_COCOA if (!display && (!user_choice || g_strstr_len (user_choice, 5, "cocoa"))) @@ -140,8 +141,9 @@ gst_gl_display_new (void) #endif if (!display) { /* subclass returned a NULL window */ - GST_WARNING ("Could not create display. user specified %s, creating dummy", - user_choice ? user_choice : "(null)"); + GST_WARNING ("Could not create display. user specified %s " + "(platform: %s), creating dummy", + GST_STR_NULL (user_choice), GST_STR_NULL (platform_choice)); return g_object_new (GST_TYPE_GL_DISPLAY, NULL); } -- 2.7.4