deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Removed support for <FRAME> tag.

Browse source 
Framesets aren't used nowadays anymore so it seems reasonable to remove support for them in order to save some space.
This commit is contained in:
Oliver Schmidt 2015-05-25 16:13:24 +02:00
parent 4a6909d16a
commit a8837e230c
4 changed files with 13 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apps/webbrowser/html-strings
View file

@ -9,7 +9,6 @@ html_a "a\0"
html_body "body\0" html_body "body\0"
html_br "br\0" html_br "br\0"
html_form "form\0" html_form "form\0"
html_frame "frame\0"
html_h1 "h1\0" html_h1 "h1\0"
html_h2 "h2\0" html_h2 "h2\0"
html_h3 "h3\0" html_h3 "h3\0"

3
apps/webbrowser/html-strings.c
View file

@ -31,9 +31,6 @@ const char html_br[4] =
const char html_form[6] = const char html_form[6] =
/* "form\0" */ /* "form\0" */
{0x66, 0x6f, 0x72, 0x6d, 00, }; {0x66, 0x6f, 0x72, 0x6d, 00, };
const char html_frame[7] =
/* "frame\0" */
{0x66, 0x72, 0x61, 0x6d, 0x65, 00, };
const char html_h1[4] = const char html_h1[4] =
/* "h1\0" */ /* "h1\0" */
{0x68, 0x31, 00, }; {0x68, 0x31, 00, };

1
apps/webbrowser/html-strings.h
View file

@ -9,7 +9,6 @@ extern const char html_a[3];
extern const char html_body[6]; extern const char html_body[6];
extern const char html_br[4]; extern const char html_br[4];
extern const char html_form[6]; extern const char html_form[6];
extern const char html_frame[7];
extern const char html_h1[4]; extern const char html_h1[4];
extern const char html_h2[4]; extern const char html_h2[4];
extern const char html_h3[4]; extern const char html_h3[4];

46
apps/webbrowser/htmlparser.c
View file

@ -119,9 +119,6 @@ G * (<br>, <p>, <h>), the <li> tag (but does not even try to
#define ISO_eq 0x3d #define ISO_eq 0x3d
#define ISO_gt 0x3e #define ISO_gt 0x3e
#define ISO_rbrack 0x5b
#define ISO_lbrack 0x5d
#define MINORSTATE_NONE 0 #define MINORSTATE_NONE 0
#define MINORSTATE_TEXT 1 /* Parse normal text */ #define MINORSTATE_TEXT 1 /* Parse normal text */
#define MINORSTATE_EXTCHAR 2 /* Check for semi-colon */ #define MINORSTATE_EXTCHAR 2 /* Check for semi-colon */
@ -196,33 +193,31 @@ static const char *tags[] = {
html_br, html_br,
#define TAG_FORM 10 #define TAG_FORM 10
html_form, html_form,
#define TAG_FRAME 11 #define TAG_H1 11
html_frame,
#define TAG_H1 12
html_h1, html_h1,
#define TAG_H2 13 #define TAG_H2 12
html_h2, html_h2,
#define TAG_H3 14 #define TAG_H3 13
html_h3, html_h3,
#define TAG_H4 15 #define TAG_H4 14
html_h4, html_h4,
#define TAG_IMG 16 #define TAG_IMG 15
html_img, html_img,
#define TAG_INPUT 17 #define TAG_INPUT 16
html_input, html_input,
#define TAG_LI 18 #define TAG_LI 17
html_li, html_li,
#define TAG_P 19 #define TAG_P 18
html_p, html_p,
#define TAG_SCRIPT 20 #define TAG_SCRIPT 19
html_script, html_script,
#define TAG_SELECT 21 #define TAG_SELECT 20
html_select, html_select,
#define TAG_STYLE 22 #define TAG_STYLE 21
html_style, html_style,
#define TAG_TR 23 #define TAG_TR 22
html_tr, html_tr,
#define TAG_LAST 24 #define TAG_LAST 23
last, last,
}; };
@ -370,8 +365,6 @@ parse_tag(void)
static char *tagattrparam; static char *tagattrparam;
static unsigned char size; static unsigned char size;
static char dummy;
PRINTF(("Parsing tag '%s' '%s' '%s'\n", s.tag, s.tagattr, s.tagattrparam)); PRINTF(("Parsing tag '%s' '%s' '%s'\n", s.tag, s.tagattr, s.tagattrparam));
switch(find_tag(s.tag)) { switch(find_tag(s.tag)) {
@ -386,7 +379,6 @@ parse_tag(void)
case TAG_TR: case TAG_TR:
case TAG_SLASHDIV: case TAG_SLASHDIV:
case TAG_SLASHH: case TAG_SLASHH:
dummy = 0;
newline(); newline();
break; break;
case TAG_LI: case TAG_LI:
@ -410,18 +402,6 @@ parse_tag(void)
case TAG_BODY: case TAG_BODY:
s.majorstate = s.lastmajorstate = MAJORSTATE_BODY; s.majorstate = s.lastmajorstate = MAJORSTATE_BODY;
break; break;
case TAG_FRAME:
if(strncmp(s.tagattr, html_src, sizeof(html_src)) == 0 && s.tagattrparam[0] != 0) {
switch_majorstate(MAJORSTATE_BODY);
newline();
add_char(ISO_rbrack);
do_word();
htmlparser_link((char *)html_frame, (unsigned char)strlen(html_frame), s.tagattrparam);
PRINTF(("Frame [%s]\n", s.tagattrparam));
add_char(ISO_lbrack);
newline();
}
break;
case TAG_IMG: case TAG_IMG:
if(strncmp(s.tagattr, html_alt, sizeof(html_alt)) == 0 && s.tagattrparam[0] != 0) { if(strncmp(s.tagattr, html_alt, sizeof(html_alt)) == 0 && s.tagattrparam[0] != 0) {
add_char(ISO_lt); add_char(ISO_lt);