Commit ddc97a84 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

variables: remove unused var_Destroy() return value

parent 7e1ef2be
...@@ -141,7 +141,7 @@ enum { ...@@ -141,7 +141,7 @@ enum {
VLC_API int var_Create( vlc_object_t *, const char *, int ); VLC_API int var_Create( vlc_object_t *, const char *, int );
#define var_Create(a,b,c) var_Create( VLC_OBJECT(a), b, c ) #define var_Create(a,b,c) var_Create( VLC_OBJECT(a), b, c )
VLC_API int var_Destroy( vlc_object_t *, const char * ); VLC_API void var_Destroy( vlc_object_t *, const char * );
#define var_Destroy(a,b) var_Destroy( VLC_OBJECT(a), b ) #define var_Destroy(a,b) var_Destroy( VLC_OBJECT(a), b )
VLC_API int var_Change( vlc_object_t *, const char *, int, vlc_value_t *, vlc_value_t * ); VLC_API int var_Change( vlc_object_t *, const char *, int, vlc_value_t *, vlc_value_t * );
......
...@@ -418,7 +418,6 @@ int var_Create( vlc_object_t *p_this, const char *psz_name, int i_type ) ...@@ -418,7 +418,6 @@ int var_Create( vlc_object_t *p_this, const char *psz_name, int i_type )
return ret; return ret;
} }
#undef var_Destroy
/** /**
* Destroy a vlc variable * Destroy a vlc variable
* *
...@@ -428,7 +427,7 @@ int var_Create( vlc_object_t *p_this, const char *psz_name, int i_type ) ...@@ -428,7 +427,7 @@ int var_Create( vlc_object_t *p_this, const char *psz_name, int i_type )
* \param p_this The object that holds the variable * \param p_this The object that holds the variable
* \param psz_name The name of the variable * \param psz_name The name of the variable
*/ */
int var_Destroy( vlc_object_t *p_this, const char *psz_name ) void (var_Destroy)(vlc_object_t *p_this, const char *psz_name)
{ {
variable_t *p_var; variable_t *p_var;
...@@ -440,7 +439,7 @@ int var_Destroy( vlc_object_t *p_this, const char *psz_name ) ...@@ -440,7 +439,7 @@ int var_Destroy( vlc_object_t *p_this, const char *psz_name )
if( p_var == NULL ) if( p_var == NULL )
{ {
vlc_mutex_unlock( &p_priv->var_lock ); vlc_mutex_unlock( &p_priv->var_lock );
return VLC_ENOVAR; return;
} }
WaitUnused( p_this, p_var ); WaitUnused( p_this, p_var );
...@@ -453,7 +452,6 @@ int var_Destroy( vlc_object_t *p_this, const char *psz_name ) ...@@ -453,7 +452,6 @@ int var_Destroy( vlc_object_t *p_this, const char *psz_name )
if( p_var != NULL ) if( p_var != NULL )
Destroy( p_var ); Destroy( p_var );
return VLC_SUCCESS;
} }
static void CleanupVar( void *var ) static void CleanupVar( void *var )
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment