diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/gui/gwps-common.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/apps/gui/gwps-common.c b/apps/gui/gwps-common.c index 4c790b3948..97ec1c19fa 100644 --- a/apps/gui/gwps-common.c +++ b/apps/gui/gwps-common.c | |||
@@ -767,7 +767,8 @@ static char* get_dir(char* buf, int buf_size, const char* path, int level) | |||
767 | intval is used with conditionals/enums: when this function is called, | 767 | intval is used with conditionals/enums: when this function is called, |
768 | intval should contain the number of options in the conditional/enum. | 768 | intval should contain the number of options in the conditional/enum. |
769 | When this function returns, intval is -1 if the tag is non numeric or, | 769 | When this function returns, intval is -1 if the tag is non numeric or, |
770 | if the tag is numeric, intval is the enum case we want to go to. | 770 | if the tag is numeric, *intval is the enum case we want to go to (between 1 |
771 | and the original value of *intval, inclusive). | ||
771 | When not treating a conditional/enum, intval should be NULL. | 772 | When not treating a conditional/enum, intval should be NULL. |
772 | */ | 773 | */ |
773 | static char *get_token_value(struct gui_wps *gwps, | 774 | static char *get_token_value(struct gui_wps *gwps, |
@@ -815,7 +816,7 @@ static char *get_token_value(struct gui_wps *gwps, | |||
815 | limit = *intval; | 816 | limit = *intval; |
816 | *intval = -1; | 817 | *intval = -1; |
817 | } | 818 | } |
818 | 819 | ||
819 | switch (token->type) | 820 | switch (token->type) |
820 | { | 821 | { |
821 | case WPS_TOKEN_CHARACTER: | 822 | case WPS_TOKEN_CHARACTER: |
@@ -909,7 +910,7 @@ static char *get_token_value(struct gui_wps *gwps, | |||
909 | 910 | ||
910 | case WPS_TOKEN_METADATA_GROUPING: | 911 | case WPS_TOKEN_METADATA_GROUPING: |
911 | return id3->grouping; | 912 | return id3->grouping; |
912 | 913 | ||
913 | case WPS_TOKEN_METADATA_GENRE: | 914 | case WPS_TOKEN_METADATA_GENRE: |
914 | return id3->genre_string; | 915 | return id3->genre_string; |
915 | 916 | ||
@@ -1415,8 +1416,8 @@ static int find_conditional_end(struct wps_data *data, int index) | |||
1415 | return ret; | 1416 | return ret; |
1416 | } | 1417 | } |
1417 | 1418 | ||
1418 | /* Return the index of the appropriate case for the conditional | 1419 | /* Evaluate the conditional that is at *token_index and return whether a skip |
1419 | that starts at cond_index. | 1420 | has ocurred. *token_index is updated with the new position. |
1420 | */ | 1421 | */ |
1421 | static bool evaluate_conditional(struct gui_wps *gwps, int *token_index) | 1422 | static bool evaluate_conditional(struct gui_wps *gwps, int *token_index) |
1422 | { | 1423 | { |
@@ -1449,7 +1450,7 @@ static bool evaluate_conditional(struct gui_wps *gwps, int *token_index) | |||
1449 | 1450 | ||
1450 | data->tokens[cond_index].value.i = (intval << 8) + num_options; | 1451 | data->tokens[cond_index].value.i = (intval << 8) + num_options; |
1451 | 1452 | ||
1452 | /* skip to the right enum case */ | 1453 | /* skip to the appropriate enum case */ |
1453 | int next = cond_index + 2; | 1454 | int next = cond_index + 2; |
1454 | for (i = 1; i < intval; i++) | 1455 | for (i = 1; i < intval; i++) |
1455 | { | 1456 | { |