if( check ) \
{ \
psz_meta = string; \
- if( psz_meta ) \
+ if( psz_meta != NULL ) \
{ \
int len = strlen( string ); \
dst = realloc( dst, \
} \
else \
{ \
- *d = '-'; \
- d++; \
+ *d = '-'; \
+ d++; \
} \
}
break;
case 's':
{
- char *lang;
+ char *lang = NULL;
if( p_input )
- {
- lang = var_GetString( p_input, "sub-language" );
- }
- else
- {
+ lang = var_GetNonEmptyString( p_input, "sub-language" );
+ if( lang == NULL )
lang = strdup( b_empty_if_na ? "" : "-" );
- }
INSERT_STRING( 1, lang );
break;
}
break;
case 'O':
{
- char *lang;
+ char *lang = NULL;
if( p_input )
- {
- lang = var_GetString( p_input, "audio-language" );
- }
- else
- {
+ lang = var_GetNonEmptyString( p_input,
+ "audio-language" );
+ if( lang == NULL )
lang = strdup( b_empty_if_na ? "" : "-" );
- }
INSERT_STRING( 1, lang );
break;
}