From: Rémi Denis-Courmont <rem@videolan.org>
Date: Sat, 10 Feb 2007 10:10:25 +0000 (+0000)
Subject: Add var_GetNonEmptyString
X-Git-Tag: 0.9.0-test0~8670
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=8fb6706801e5718d6c533b95e7815654a810481d;p=vlc

Add var_GetNonEmptyString
---

diff --git a/include/vlc_variables.h b/include/vlc_variables.h
index 6e296b7ace..d11f0564b3 100644
--- a/include/vlc_variables.h
+++ b/include/vlc_variables.h
@@ -350,6 +350,18 @@ static inline char *__var_GetString( vlc_object_t *p_obj, const char *psz_name )
         return strdup( "" );
 }
 
+static inline char *__var_GetNonEmptyString( vlc_object_t *obj, const char *name )
+{
+    vlc_value_t val;
+    if (!__var_Get (obj, name, &val))
+        return NULL;
+    if (*val.psz_string)
+        return val.psz_string;
+    free (val.psz_string);
+    return NULL;
+}
+
+
 /**
  * __var_GetInteger() with automatic casting
  */
@@ -370,6 +382,7 @@ static inline char *__var_GetString( vlc_object_t *p_obj, const char *psz_name )
  * __var_GetString() with automatic casting
  */
 #define var_GetString(a,b)   __var_GetString( VLC_OBJECT(a),b)
+#define var_GetNonEmptyString(a,b)   __var_GetNonEmptyString( VLC_OBJECT(a),b)