summaryrefslogtreecommitdiff
path: root/apps/gui/wps_parser.c
diff options
context:
space:
mode:
Diffstat (limited to 'apps/gui/wps_parser.c')
-rw-r--r--apps/gui/wps_parser.c11
1 files changed, 0 insertions, 11 deletions
diff --git a/apps/gui/wps_parser.c b/apps/gui/wps_parser.c
index 8a226e1963..2a610bdb8c 100644
--- a/apps/gui/wps_parser.c
+++ b/apps/gui/wps_parser.c
@@ -490,13 +490,6 @@ static int parse_subline_timeout(const char *wps_bufptr, struct wps_data *wps_da
490 if (have_tenth == false) 490 if (have_tenth == false)
491 val *= 10; 491 val *= 10;
492 492
493 /* We only want to allow strictly positive timeout values */
494 if (val <= 0)
495 val = DEFAULT_SUBLINE_TIME_MULTIPLIER;
496
497 int line = wps_data->num_lines;
498 int subline = wps_data->num_sublines[line];
499 wps_data->time_mult[line][subline] = val;
500 wps_data->tokens[wps_data->num_tokens].value.i = val; 493 wps_data->tokens[wps_data->num_tokens].value.i = val;
501 494
502 return skip; 495 return skip;
@@ -624,8 +617,6 @@ static bool wps_parse(struct wps_data *data, const char *wps_bufptr)
624 data->num_tokens = 0; 617 data->num_tokens = 0;
625 char *current_string = data->string_buffer; 618 char *current_string = data->string_buffer;
626 619
627 data->time_mult[0][0] = DEFAULT_SUBLINE_TIME_MULTIPLIER;
628
629 while(wps_bufptr && *wps_bufptr && data->num_tokens < WPS_MAX_TOKENS 620 while(wps_bufptr && *wps_bufptr && data->num_tokens < WPS_MAX_TOKENS
630 && data->num_lines < WPS_MAX_LINES) 621 && data->num_lines < WPS_MAX_LINES)
631 { 622 {
@@ -644,7 +635,6 @@ static bool wps_parse(struct wps_data *data, const char *wps_bufptr)
644 data->tokens[data->num_tokens++].type = WPS_TOKEN_SUBLINE_SEPARATOR; 635 data->tokens[data->num_tokens++].type = WPS_TOKEN_SUBLINE_SEPARATOR;
645 subline = ++(data->num_sublines[data->num_lines]); 636 subline = ++(data->num_sublines[data->num_lines]);
646 data->format_lines[data->num_lines][subline] = data->num_tokens; 637 data->format_lines[data->num_lines][subline] = data->num_tokens;
647 data->time_mult[data->num_lines][subline] = DEFAULT_SUBLINE_TIME_MULTIPLIER;
648 } 638 }
649 else 639 else
650 wps_bufptr += skip_end_of_line(wps_bufptr); 640 wps_bufptr += skip_end_of_line(wps_bufptr);
@@ -711,7 +701,6 @@ condlistend: /* close a conditional. sometimes we want to close them even when
711 if (data->num_lines < WPS_MAX_LINES) 701 if (data->num_lines < WPS_MAX_LINES)
712 { 702 {
713 data->format_lines[data->num_lines][0] = data->num_tokens; 703 data->format_lines[data->num_lines][0] = data->num_tokens;
714 data->time_mult[data->num_lines][0] = DEFAULT_SUBLINE_TIME_MULTIPLIER;
715 } 704 }
716 705
717 break; 706 break;