From a8837e230cee765de8e3ae91f4638ec53305f344 Mon Sep 17 00:00:00 2001
From: Oliver Schmidt
Date: Mon, 25 May 2015 16:13:24 +0200
Subject: [PATCH] Removed support for tag.
Framesets aren't used nowadays anymore so it seems reasonable to remove support for them in order to save some space.
---
apps/webbrowser/html-strings | 1 -
apps/webbrowser/html-strings.c | 3 ---
apps/webbrowser/html-strings.h | 1 -
apps/webbrowser/htmlparser.c | 46 ++++++++++------------------------
4 files changed, 13 insertions(+), 38 deletions(-)
diff --git a/apps/webbrowser/html-strings b/apps/webbrowser/html-strings
index e56d8f600..e319dc651 100644
--- a/apps/webbrowser/html-strings
+++ b/apps/webbrowser/html-strings
@@ -9,7 +9,6 @@ html_a "a\0"
html_body "body\0"
html_br "br\0"
html_form "form\0"
-html_frame "frame\0"
html_h1 "h1\0"
html_h2 "h2\0"
html_h3 "h3\0"
diff --git a/apps/webbrowser/html-strings.c b/apps/webbrowser/html-strings.c
index 51fc3f1cd..5743f1a03 100644
--- a/apps/webbrowser/html-strings.c
+++ b/apps/webbrowser/html-strings.c
@@ -31,9 +31,6 @@ const char html_br[4] =
const char html_form[6] =
/* "form\0" */
{0x66, 0x6f, 0x72, 0x6d, 00, };
-const char html_frame[7] =
-/* "frame\0" */
-{0x66, 0x72, 0x61, 0x6d, 0x65, 00, };
const char html_h1[4] =
/* "h1\0" */
{0x68, 0x31, 00, };
diff --git a/apps/webbrowser/html-strings.h b/apps/webbrowser/html-strings.h
index cf09c0107..5bcf03978 100644
--- a/apps/webbrowser/html-strings.h
+++ b/apps/webbrowser/html-strings.h
@@ -9,7 +9,6 @@ extern const char html_a[3];
extern const char html_body[6];
extern const char html_br[4];
extern const char html_form[6];
-extern const char html_frame[7];
extern const char html_h1[4];
extern const char html_h2[4];
extern const char html_h3[4];
diff --git a/apps/webbrowser/htmlparser.c b/apps/webbrowser/htmlparser.c
index 7ca5f7575..b3c46574e 100644
--- a/apps/webbrowser/htmlparser.c
+++ b/apps/webbrowser/htmlparser.c
@@ -119,9 +119,6 @@ G * (
, , ), the tag (but does not even try to
#define ISO_eq 0x3d
#define ISO_gt 0x3e
-#define ISO_rbrack 0x5b
-#define ISO_lbrack 0x5d
-
#define MINORSTATE_NONE 0
#define MINORSTATE_TEXT 1 /* Parse normal text */
#define MINORSTATE_EXTCHAR 2 /* Check for semi-colon */
@@ -196,33 +193,31 @@ static const char *tags[] = {
html_br,
#define TAG_FORM 10
html_form,
-#define TAG_FRAME 11
- html_frame,
-#define TAG_H1 12
+#define TAG_H1 11
html_h1,
-#define TAG_H2 13
+#define TAG_H2 12
html_h2,
-#define TAG_H3 14
+#define TAG_H3 13
html_h3,
-#define TAG_H4 15
+#define TAG_H4 14
html_h4,
-#define TAG_IMG 16
+#define TAG_IMG 15
html_img,
-#define TAG_INPUT 17
+#define TAG_INPUT 16
html_input,
-#define TAG_LI 18
+#define TAG_LI 17
html_li,
-#define TAG_P 19
+#define TAG_P 18
html_p,
-#define TAG_SCRIPT 20
+#define TAG_SCRIPT 19
html_script,
-#define TAG_SELECT 21
+#define TAG_SELECT 20
html_select,
-#define TAG_STYLE 22
+#define TAG_STYLE 21
html_style,
-#define TAG_TR 23
+#define TAG_TR 22
html_tr,
-#define TAG_LAST 24
+#define TAG_LAST 23
last,
};
@@ -370,8 +365,6 @@ parse_tag(void)
static char *tagattrparam;
static unsigned char size;
- static char dummy;
-
PRINTF(("Parsing tag '%s' '%s' '%s'\n", s.tag, s.tagattr, s.tagattrparam));
switch(find_tag(s.tag)) {
@@ -386,7 +379,6 @@ parse_tag(void)
case TAG_TR:
case TAG_SLASHDIV:
case TAG_SLASHH:
- dummy = 0;
newline();
break;
case TAG_LI:
@@ -410,18 +402,6 @@ parse_tag(void)
case TAG_BODY:
s.majorstate = s.lastmajorstate = MAJORSTATE_BODY;
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:
if(strncmp(s.tagattr, html_alt, sizeof(html_alt)) == 0 && s.tagattrparam[0] != 0) {
add_char(ISO_lt);