msg_Info( p_intf, "using the VLM interface plugin..." );
- i_telnetport = config_GetInt( p_intf, "telnet-port" );
- psz_address = config_GetPsz( p_intf, "telnet-host" );
-
+ i_telnetport = var_InheritInteger( p_intf, "telnet-port" );
+ psz_address = var_InheritString( p_intf, "telnet-host" );
vlc_UrlParse(&url, psz_address, 0);
free( psz_address );
nlisten++; /* How many listening sockets do we have? */
/* FIXME: make sure config_* is cancel-safe */
- psz_password = config_GetPsz( p_intf, "telnet-password" );
+ psz_password = var_InheritString( p_intf, "telnet-password" );
vlc_cleanup_push( free, psz_password );
for( ;; )
}
i_message += strlen( message->psz_name ) + i_level * sizeof( " " ) + 1;
- psz_message = malloc( i_message );
+ psz_message = xmalloc( i_message );
*psz_message = 0;
for( i = 0; i < i_level; i++ ) strcat( psz_message, " " );
strcat( psz_message, message->psz_name );
{
i_message += sizeof( " : " ) + strlen( message->psz_value ) +
sizeof( STRING_CR );
- psz_message = realloc( psz_message, i_message );
+ psz_message = xrealloc( psz_message, i_message );
strcat( psz_message, " : " );
strcat( psz_message, message->psz_value );
strcat( psz_message, STRING_CR );
else
{
i_message += sizeof( STRING_CR );
- psz_message = realloc( psz_message, i_message );
+ psz_message = xrealloc( psz_message, i_message );
strcat( psz_message, STRING_CR );
}
MessageToString( message->child[i], i_level + 1 );
i_message += strlen( child_message );
- psz_message = realloc( psz_message, i_message );
+ psz_message = xrealloc( psz_message, i_message );
strcat( psz_message, child_message );
free( child_message );
}