Switch the few var_GetString remains to var_GetNonEmptyString

diff --git a/modules/gui/wxwidgets/extrapanel.cpp b/modules/gui/wxwidgets/extrapanel.cpp
index 61d92115a89a339b2670434cfdbba135480960f4..59da29aca2c3041ec5068cc631206bfc2fe93525 100644 (file)
--- a/modules/gui/wxwidgets/extrapanel.cpp
+++ b/modules/gui/wxwidgets/extrapanel.cpp
@@ -1036,7 +1036,9 @@ void ExtraPanel::CheckAout()
             p_intf->p_sys->p_aout = p_aout;
 
             f_preamp = var_GetFloat( p_aout, "equalizer-preamp" );
-            psz_bands = var_GetString( p_aout, "equalizer-bands" );
+            psz_bands = var_GetNonEmptyString( p_aout, "equalizer-bands" );
+            if( psz_bands == NULL )
+                psz_bands = strdup("");
             b_update = VLC_TRUE;
         }
         vlc_object_release( p_aout );

diff --git a/modules/services_discovery/podcast.c b/modules/services_discovery/podcast.c
index 9b77260f750daf2df19f5b073c2f1f7ce48202a3..20c1bceb4bb91f3f65812d76e6130c9d8f338bc3 100644 (file)
--- a/modules/services_discovery/podcast.c
+++ b/modules/services_discovery/podcast.c
@@ -158,8 +158,9 @@ static void Run( services_discovery_t *p_sd )
         if( p_sys->b_update == VLC_TRUE )
         {
             msg_Dbg( p_sd, "Update required" );
-            psz_urls = var_GetString( p_sd, "podcast-urls" );
-            ParseUrls( p_sd, psz_urls );
+            psz_urls = var_GetNonEmptyString( p_sd, "podcast-urls" );
+            if( psz_urls != NULL )
+                ParseUrls( p_sd, psz_urls );
             free( psz_urls );
             p_sys->b_update = VLC_FALSE;
         }

diff --git a/src/control/video.c b/src/control/video.c
index 4dc0c2181e7c2c424736381fa9d1b20610f14fa9..24103f023ea991d6303afc2f2630d5a7fb74b232 100644 (file)
--- a/src/control/video.c
+++ b/src/control/video.c
@@ -359,9 +359,9 @@ char *libvlc_video_get_aspect_ratio( libvlc_media_instance_t *p_mi,
     if( !p_vout )
         return 0;
 
-    psz_aspect = var_GetString( p_vout, "aspect-ratio" );
+    psz_aspect = var_GetNonEmptyString( p_vout, "aspect-ratio" );
     vlc_object_release( p_vout );
-    return psz_aspect;
+    return psz_aspect ? psz_aspect : strdup("");
 }
 
 void libvlc_video_set_aspect_ratio( libvlc_media_instance_t *p_mi,
@@ -458,9 +458,9 @@ char *libvlc_video_get_crop_geometry( libvlc_media_instance_t *p_mi,
     if( !p_vout )
         return 0;
 
-    psz_geometry = var_GetString( p_vout, "crop" );
+    psz_geometry = var_GetNonEmptyString( p_vout, "crop" );
     vlc_object_release( p_vout );
-    return psz_geometry;
+    return psz_geometry ? psz_geometry : strdup("");
 }
 
 void libvlc_video_set_crop_geometry( libvlc_media_instance_t *p_mi,

diff --git a/src/input/demux.c b/src/input/demux.c
index b6857dc432e04eafe898be9c152e544045d4d8f4..712bfd2276ef87173b2c08acfd0da14ad32be87c 100644 (file)
--- a/src/input/demux.c
+++ b/src/input/demux.c
@@ -50,7 +50,9 @@ demux_t *__demux2_New( vlc_object_t *p_obj,
     if( *p_demux->psz_demux == '\0' )
     {
         free( p_demux->psz_demux );
-        p_demux->psz_demux = var_GetString( p_obj, "demux" );
+        p_demux->psz_demux = var_GetNonEmptyString( p_obj, "demux" );
+        if( p_demux->psz_demux == NULL )
+            p_demux->psz_demux = strdup( "" );
     }
 
     if( !b_quick )

diff --git a/src/input/input.c b/src/input/input.c
index 5a4db78a4051eab9aac287f159a56dd9e01c62d1..00878167bf2b097c35c1f54bfd2d3f04e211a2b7 100644 (file)
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -995,11 +995,13 @@ static int Init( input_thread_t * p_input )
         var_Get( p_input, "sub-autodetect-file", &val );
         if( val.b_bool )
         {
-            char *psz_autopath = var_GetString( p_input, "sub-autodetect-path" );
+            char *psz_autopath = var_GetNonEmptyString( p_input, "sub-autodetect-path" );
             char **subs = subtitles_Detect( p_input, psz_autopath,
                                             p_input->p->input.p_item->psz_uri );
             input_source_t *sub;
             i = 0;
+            if( psz_autopath == NULL )
+                psz_autopath = strdup("");
 
             /* Try to autoselect the first autodetected subtitles file
              * if no subtitles file was specified */