Changeset 2c88f1bf0243835d95b2212a5cba815dbe06f44b
- Timestamp:
- 27/08/08 02:13:19
(3 months ago)
- Author:
- Antoine Cellerier <dionoea@videolan.org>
- git-committer:
- Antoine Cellerier <dionoea@videolan.org> 1219795999 +0200
- git-parent:
[f7c803609707a35ae20218bb50242d5d18d24528]
- git-author:
- Antoine Cellerier <dionoea@videolan.org> 1219795867 +0200
- Message:
Always enforce the "don't show if unavailable" option in format strings.
-
Files:
-
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
| r491e2b0 |
r2c88f1b |
|
| 639 | 639 | free( string ); \ |
|---|
| 640 | 640 | } \ |
|---|
| 641 | | else \ |
|---|
| | 641 | else if( !b_empty_if_na ) \ |
|---|
| 642 | 642 | { \ |
|---|
| 643 | 643 | *(dst+d) = '-'; \ |
|---|
| … | … | |
| 656 | 656 | { |
|---|
| 657 | 657 | const char *s = string; |
|---|
| 658 | | int b_is_format = 0; |
|---|
| 659 | | int b_empty_if_na = 0; |
|---|
| | 658 | bool b_is_format = false; |
|---|
| | 659 | bool b_empty_if_na = false; |
|---|
| 660 | 660 | char buf[10]; |
|---|
| 661 | 661 | int i_size = strlen( string ) + 1; /* +1 to store '\0' */ |
|---|
| … | … | |
| 939 | 939 | |
|---|
| 940 | 940 | case ' ': |
|---|
| 941 | | b_empty_if_na = 1; |
|---|
| | 941 | b_empty_if_na = true; |
|---|
| 942 | 942 | break; |
|---|
| 943 | 943 | |
|---|
| … | … | |
| 948 | 948 | } |
|---|
| 949 | 949 | if( *s != ' ' ) |
|---|
| 950 | | b_is_format = 0; |
|---|
| | 950 | b_is_format = false; |
|---|
| 951 | 951 | } |
|---|
| 952 | 952 | else if( *s == '$' ) |
|---|
| 953 | 953 | { |
|---|
| 954 | | b_is_format = 1; |
|---|
| 955 | | b_empty_if_na = 0; |
|---|
| | 954 | b_is_format = true; |
|---|
| | 955 | b_empty_if_na = false; |
|---|
| 956 | 956 | } |
|---|
| 957 | 957 | else |
|---|