videolan/vlc
1
Fork 0
mirror of https://code.videolan.org/videolan/vlc synced 2024-09-28 23:09:59 +02:00
Code Releases Activity

Avoid ugly non-const cast

Browse Source
This commit is contained in:
Rémi Denis-Courmont 2006-03-08 11:52:46 +00:00
parent 7146789f5f
commit b25c2e85e2
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/misc/variables.c
View File

@ -1,7 +1,7 @@
/***************************************************************************** /*****************************************************************************
* variables.c: routines for object variables handling * variables.c: routines for object variables handling
***************************************************************************** *****************************************************************************
* Copyright (C) 2002-2004 the VideoLAN team * Copyright (C) 2002-2006 the VideoLAN team
* $Id$ * $Id$
* *
* Authors: Samuel Hocevar <sam@zoy.org> * Authors: Samuel Hocevar <sam@zoy.org>
@ -926,10 +926,9 @@ int __var_DelCallback( vlc_object_t *p_this, const char *psz_name,
* \param psz_option the option to parse * \param psz_option the option to parse
* \return nothing * \return nothing
*/ */
void __var_OptionParse( vlc_object_t *p_obj,const char *psz_option ) void __var_OptionParse( vlc_object_t *p_obj, const char *psz_option )
{ {
char *psz_name = (char *)psz_option; char *psz_name, *psz_value = strchr( psz_option, '=' );
char *psz_value = strchr( psz_option, '=' );
int i_name_len, i_type; int i_name_len, i_type;
vlc_bool_t b_isno = VLC_FALSE; vlc_bool_t b_isno = VLC_FALSE;
vlc_value_t val; vlc_value_t val;
@ -939,15 +938,15 @@ void __var_OptionParse( vlc_object_t *p_obj,const char *psz_option )
/* It's too much of an hassle to remove the ':' when we parse /* It's too much of an hassle to remove the ':' when we parse
* the cmd line :) */ * the cmd line :) */
if( i_name_len && *psz_name == ':' ) if( i_name_len && *psz_option == ':' )
{ {
psz_name++; psz_option++;
i_name_len--; i_name_len--;
} }
if( i_name_len == 0 ) return; if( i_name_len == 0 ) return;
psz_name = strndup( psz_name, i_name_len ); psz_name = strndup( psz_option, i_name_len );
if( psz_value ) psz_value++; if( psz_value ) psz_value++;
/* FIXME: :programs should be handled generically */ /* FIXME: :programs should be handled generically */
@ -1252,7 +1251,7 @@ static int LookupInner( variable_t *p_vars, int i_count, uint32_t i_hash )
* This function checks p_val's value against p_var's limitations such as * This function checks p_val's value against p_var's limitations such as
* minimal and maximal value, step, in-list position, and modifies p_val if * minimal and maximal value, step, in-list position, and modifies p_val if
* necessary. * necessary.
*****************************************************************************/ ****************************************************************************/
static void CheckValue ( variable_t *p_var, vlc_value_t *p_val ) static void CheckValue ( variable_t *p_var, vlc_value_t *p_val )
{ {
/* Check that our variable is in the list */ /* Check that our variable is in the list */