w3m

commit 96aeafcf6aacdb029587916fd379d458ccc30cb3
parent 08d106df36eaf5881dfb5dbae4b20c08fb6e38dd
Author: ukai <ukai>
Date:   Fri,  6 Dec 2002 16:33:22 +0000

[w3m-dev 03534] cleanup file.c
* file.c (HTMLlineproc2body): cleanup
From: Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>

Diffstat:
M
ChangeLog
 | 
5
+++++
M
file.c
 | 
17
++++++-----------

2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2002-12-07  Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
+
+	* [w3m-dev 03534] cleanup file.c
+	* file.c (HTMLlineproc2body): cleanup
+
 2002-12-06  Fumitoshi UKAI  <ukai@debian.or.jp>
 
 	* version.c.in: w3m/0.3.2.2+cvs
diff --git a/file.c b/file.c
@@ -4985,10 +4985,8 @@ HTMLlineproc2body(Buffer *buf, Str (*feed) (), int llimit)
 			id = url_quote_conv(id, buf->document_code);
 			registerName(buf, id, currentLn(buf), pos);
 		    }
-		    if (parsedtag_get_value(tag, ATTR_HREF, &p)) {
-			p = remove_space(p);
-			p = url_quote_conv(p, buf->document_code);
-		    }
+		    if (parsedtag_get_value(tag, ATTR_HREF, &p))
+			p = url_quote_conv(remove_space(p), buf->document_code);
 		    if (parsedtag_get_value(tag, ATTR_TARGET, &q))
 			q = url_quote_conv(q, buf->document_code);
 		    if (parsedtag_get_value(tag, ATTR_REFERER, &r))
@@ -5007,7 +5005,7 @@ HTMLlineproc2body(Buffer *buf, Str (*feed) (), int llimit)
 				      currentLn(buf), pos);
 		    if (p) {
 			effect |= PE_ANCHOR;
-			a_href = registerHref(buf, remove_space(p), q, r, s,
+			a_href = registerHref(buf, p, q, r, s,
 					      *t, currentLn(buf), pos);
 			a_href->hseq = ((hseq > 0) ? hseq : -hseq) - 1;
 			a_href->slave = (hseq > 0) ? FALSE : TRUE;
@@ -5053,8 +5051,7 @@ HTMLlineproc2body(Buffer *buf, Str (*feed) (), int llimit)
 #endif
 			s = NULL;
 			parsedtag_get_value(tag, ATTR_TITLE, &s);
-			p = remove_space(p);
-			p = url_quote_conv(p, buf->document_code);
+			p = url_quote_conv(remove_space(p), buf->document_code);
 			a_img = registerImg(buf, p, s, currentLn(buf), pos);
 #ifdef USE_IMAGE
 			a_img->hseq = iseq;
@@ -5205,8 +5202,7 @@ HTMLlineproc2body(Buffer *buf, Str (*feed) (), int llimit)
 			break;
 		    if (parsedtag_get_value(tag, ATTR_HREF, &p)) {
 			MapArea *a;
-			p = remove_space(p);
-			p = url_quote_conv(p, buf->document_code);
+			p = url_quote_conv(remove_space(p), buf->document_code);
 			t = NULL;
 			parsedtag_get_value(tag, ATTR_TARGET, &t);
 			q = "";
@@ -5255,8 +5251,7 @@ HTMLlineproc2body(Buffer *buf, Str (*feed) (), int llimit)
 		    break;
 		case HTML_BASE:
 		    if (parsedtag_get_value(tag, ATTR_HREF, &p)) {
-			p = remove_space(p);
-			p = url_quote_conv(p, buf->document_code);
+			p = url_quote_conv(remove_space(p), buf->document_code);
 			if (!buf->baseURL)
 			    buf->baseURL = New(ParsedURL);
 			parseURL(p, buf->baseURL, NULL);