diff options
author | Nicholas Johnson <nick@nicksphere.ch> | 2022-01-18 00:00:00 +0000 |
---|---|---|
committer | Nicholas Johnson <nick@nicksphere.ch> | 2022-01-18 00:00:00 +0000 |
commit | 73138f36af451ede4c3cdcc839067ea4b6b18800f6d5e69191978715745ae155 (patch) | |
tree | 6b210dc40258ef321a35cbc512df94a5a298ced0363f379e3d639bc8376c42c0 | |
parent | 64f8a3d78e57f40f18f9a6e4e972bba083daba2aae1544c5b8759cb4f4257bb0 (diff) |
Rename escape_and_add_tags() to escape_text_add_tags()
-rw-r--r-- | src/gemini2html.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/gemini2html.c b/src/gemini2html.c index a834f0e..cfb929d 100644 --- a/src/gemini2html.c +++ b/src/gemini2html.c @@ -93,7 +93,7 @@ void skip_non_whitespace(const char* str, size_t* pos) { /* Escapes unescaped string, prepending opening_tag and appending closing tag and a newline. * If unescaped ends in a newline, ignore the newline. Inserting it causes the returned string to line break inappropriately. */ -char* escape_and_add_tags(const char* opening_tag, const char* unescaped, const char* closing_tag, const size_t unescaped_len) { +char* escape_text_add_tags(const char* opening_tag, const char* unescaped, const char* closing_tag, const size_t unescaped_len) { char* escaped = escape_text(unescaped, unescaped_len); size_t opening_tag_len = strlen(opening_tag); @@ -143,11 +143,11 @@ enum linetype getlinetype(const char* line, const bool pre_is_toggled) { char* convert_text_line(const char* line, const size_t size) { if (line[0] == '\n') return strdup("<br/>\n"); - else return escape_and_add_tags("<p>", line, "</p>", size); + else return escape_text_add_tags("<p>", line, "</p>", size); } char* convert_pre_line(const char* line, const size_t size) { - return escape_and_add_tags("", line, "", size); + return escape_text_add_tags("", line, "", size); } char* convert_pre_toggle_line(const char* line, const size_t size) { @@ -169,7 +169,7 @@ char* convert_link_line(const char* line, const size_t size) { size_t before_link_text = after_link; skip_whitespace(line, &before_link_text); - char* escaped_href = escape_and_add_tags("<a rel=\"noreferrer noopener\" href=\"", line + before_link, "\">", after_link - before_link); + char* escaped_href = escape_text_add_tags("<a rel=\"noreferrer noopener\" href=\"", line + before_link, "\">", after_link - before_link); /* escaped_href will be appended to, so remove newline */ escaped_href[strlen(escaped_href) - 1] = '\0'; @@ -178,10 +178,10 @@ char* convert_link_line(const char* line, const size_t size) { /* if no link text exists, use the link as link text */ if (line[before_link_text] == '\0') { - escaped_with_tags = escape_and_add_tags(escaped_href, line + before_link, "</a>", after_link - before_link); + escaped_with_tags = escape_text_add_tags(escaped_href, line + before_link, "</a>", after_link - before_link); /* otherwise use the link text */ } else { - escaped_with_tags = escape_and_add_tags(escaped_href, line + before_link_text, "</a>", size - before_link_text); + escaped_with_tags = escape_text_add_tags(escaped_href, line + before_link_text, "</a>", size - before_link_text); } /* escaped_href is no longer needed */ @@ -197,7 +197,7 @@ char* convert_h1_line(const char* line, const size_t size) { skip_whitespace(line, &pos); if (line[pos] == '\0') return strdup("<h1></h1>\n"); - else return escape_and_add_tags("<h1>", line + pos, "</h1>", size - pos); + else return escape_text_add_tags("<h1>", line + pos, "</h1>", size - pos); } char* convert_h2_line(const char* line, const size_t size) { @@ -206,7 +206,7 @@ char* convert_h2_line(const char* line, const size_t size) { skip_whitespace(line, &pos); if (line[pos] == '\0') return strdup("<h2></h2>\n"); - else return escape_and_add_tags("<h2>", line + pos, "</h2>", size - pos); + else return escape_text_add_tags("<h2>", line + pos, "</h2>", size - pos); } char* convert_h3_line(const char* line, const size_t size) { @@ -215,7 +215,7 @@ char* convert_h3_line(const char* line, const size_t size) { skip_whitespace(line, &pos); if (line[pos] == '\0') return strdup("<h3></h3>\n"); - else return escape_and_add_tags("<h3>", line + pos, "</h3>", size - pos); + else return escape_text_add_tags("<h3>", line + pos, "</h3>", size - pos); } char* convert_ul_line(const char* line, const size_t size) { @@ -224,7 +224,7 @@ char* convert_ul_line(const char* line, const size_t size) { skip_whitespace(line, &pos); if (line[pos] == '\0') return strdup("<li></li>\n"); - else return escape_and_add_tags("<li>", line + pos, "</li>", size - pos); + else return escape_text_add_tags("<li>", line + pos, "</li>", size - pos); } char* convert_quote_line(const char* line, const size_t size) { @@ -233,7 +233,7 @@ char* convert_quote_line(const char* line, const size_t size) { skip_whitespace(line, &pos); if (line[pos] == '\0') return strdup("\n"); - else return escape_and_add_tags("", line + pos, "", size - pos); + else return escape_text_add_tags("", line + pos, "", size - pos); } char* convert_line(const char* line, const size_t size, const enum linetype type) { |