diff options
| author | Vicent Marti <tanoku@gmail.com> | 2014-09-03 03:40:23 +0200 |
|---|---|---|
| committer | Vicent Marti <tanoku@gmail.com> | 2014-09-09 03:39:15 +0200 |
| commit | a7314deae649646f1f7ce5ede972641b5b62538c (patch) | |
| tree | c958536337ab5cbc96d247725e0dd35fdc02b998 /src/html | |
| parent | 7e12fdba0c9a444a3cfc29c520e2f2caa57a8232 (diff) | |
338/103
Diffstat (limited to 'src/html')
| -rw-r--r-- | src/html/houdini_href_e.c | 10 | ||||
| -rw-r--r-- | src/html/houdini_html_e.c | 10 | ||||
| -rw-r--r-- | src/html/html.c | 4 |
3 files changed, 4 insertions, 20 deletions
diff --git a/src/html/houdini_href_e.c b/src/html/houdini_href_e.c index 59fe850..b2a7d79 100644 --- a/src/html/houdini_href_e.c +++ b/src/html/houdini_href_e.c @@ -62,16 +62,8 @@ houdini_escape_href(gh_buf *ob, const uint8_t *src, size_t size) while (i < size && HREF_SAFE[src[i]] != 0) i++; - if (likely(i > org)) { - if (unlikely(org == 0)) { - if (i >= size) - return 0; - - gh_buf_grow(ob, HOUDINI_ESCAPED_SIZE(size)); - } - + if (likely(i > org)) gh_buf_put(ob, src + org, i - org); - } /* escaping */ if (i >= size) diff --git a/src/html/houdini_html_e.c b/src/html/houdini_html_e.c index 316c5ce..5cdd3dd 100644 --- a/src/html/houdini_html_e.c +++ b/src/html/houdini_html_e.c @@ -54,16 +54,8 @@ houdini_escape_html0(gh_buf *ob, const uint8_t *src, size_t size, int secure) while (i < size && (esc = HTML_ESCAPE_TABLE[src[i]]) == 0) i++; - if (i > org) { - if (unlikely(org == 0)) { - if (i >= size) - return 0; - - gh_buf_grow(ob, HOUDINI_ESCAPED_SIZE(size)); - } - + if (i > org) gh_buf_put(ob, src + org, i - org); - } /* escaping */ if (unlikely(i >= size)) diff --git a/src/html/html.c b/src/html/html.c index 2f160ca..27ffe58 100644 --- a/src/html/html.c +++ b/src/html/html.c @@ -68,7 +68,7 @@ void blocks_to_html(gh_buf *html, block *b, bool tight) cr(html); gh_buf_puts(html, "<li>"); blocks_to_html(html, b->children, tight); - gh_buf_trim(html); + gh_buf_trim(html); /* TODO: rtrim */ gh_buf_puts(html, "</li>"); cr(html); break; @@ -106,7 +106,7 @@ void blocks_to_html(gh_buf *html, block *b, bool tight) cr(html); gh_buf_puts(html, "<pre><code>"); escape_html(html, b->string_content.ptr, b->string_content.size); - gh_buf_puts(html, "</pre></code>"); + gh_buf_puts(html, "</code></pre>"); cr(html); break; |