X-Git-Url: http://git.videolan.org/gitweb.cgi/vlc.git/?p=vlc.git;p=vlc.git;a=blobdiff_plain;f=src%2Ftext%2Fstrings.c;h=2191f73ee59bcbd6a420dcdfd1a3a62050e4f81d;hp=5d1395782375435cf10a18dedb84537c235b7578;hb=2c88f1bf0243835d95b2212a5cba815dbe06f44b;hpb=f7c803609707a35ae20218bb50242d5d18d24528 diff --git a/src/text/strings.c b/src/text/strings.c index 5d13957823..2191f73ee5 100644 --- a/src/text/strings.c +++ b/src/text/strings.c @@ -638,7 +638,7 @@ char *str_format_time( const char *tformat ) d += len; \ free( string ); \ } \ - else \ + else if( !b_empty_if_na ) \ { \ *(dst+d) = '-'; \ d++; \ @@ -655,8 +655,8 @@ char *str_format_time( const char *tformat ) char *__str_format_meta( vlc_object_t *p_object, const char *string ) { const char *s = string; - int b_is_format = 0; - int b_empty_if_na = 0; + bool b_is_format = false; + bool b_empty_if_na = false; char buf[10]; int i_size = strlen( string ) + 1; /* +1 to store '\0' */ char *dst = strdup( string ); @@ -938,7 +938,7 @@ char *__str_format_meta( vlc_object_t *p_object, const char *string ) break; case ' ': - b_empty_if_na = 1; + b_empty_if_na = true; break; default: @@ -947,12 +947,12 @@ char *__str_format_meta( vlc_object_t *p_object, const char *string ) break; } if( *s != ' ' ) - b_is_format = 0; + b_is_format = false; } else if( *s == '$' ) { - b_is_format = 1; - b_empty_if_na = 0; + b_is_format = true; + b_empty_if_na = false; } else {