From 73323a7fc0bf29b0409a34bafc728374fd58bb7a Mon Sep 17 00:00:00 2001 From: default Date: Sun, 13 Nov 2022 08:41:50 +0100 Subject: [PATCH] Some formatting refactoring. --- activitypub.c | 4 ++-- format.c | 6 ++---- html.c | 2 +- main.c | 2 +- snac.h | 2 +- 5 files changed, 7 insertions(+), 9 deletions(-) diff --git a/activitypub.c b/activitypub.c index ccb21c8..6314314 100644 --- a/activitypub.c +++ b/activitypub.c @@ -409,7 +409,7 @@ d_char *msg_actor(snac *snac) msg = xs_dict_set(msg, "preferredUsername", snac->uid); msg = xs_dict_set(msg, "published", xs_dict_get(snac->config, "published")); - not_really_markdown(xs_dict_get(snac->config, "bio"), &f_bio); + f_bio = not_really_markdown(xs_dict_get(snac->config, "bio")); msg = xs_dict_set(msg, "summary", f_bio); char *folders[] = { "inbox", "outbox", "followers", "following", NULL }; @@ -548,7 +548,7 @@ d_char *msg_note(snac *snac, char *content, char *rcpts, char *in_reply_to, char } /* format the content */ - not_really_markdown(content, &fc2); + fc2 = not_really_markdown(content); /* extract the tags */ process_tags(fc2, &fc1, &tag); diff --git a/format.c b/format.c index 93080fe..13f0840 100644 --- a/format.c +++ b/format.c @@ -34,7 +34,7 @@ struct { }; -d_char *not_really_markdown(char *content, d_char **f_content) +d_char *not_really_markdown(char *content) /* formats a content using some Markdown rules */ { d_char *s = NULL; @@ -149,9 +149,7 @@ d_char *not_really_markdown(char *content, d_char **f_content) s = xs_replace_i(s, smileys[n].key, smileys[n].value); } - *f_content = s; - - return *f_content; + return s; } diff --git a/html.c b/html.c index f7c2b2f..2d4f3a4 100644 --- a/html.c +++ b/html.c @@ -215,7 +215,7 @@ d_char *html_user_header(snac *snac, d_char *s, int local) "
%s
\n" "\n"; - not_really_markdown(xs_dict_get(snac->config, "bio"), &bio); + bio = not_really_markdown(xs_dict_get(snac->config, "bio")); xs *s1 = xs_fmt(_tmpl, xs_dict_get(snac->config, "name"), diff --git a/main.c b/main.c index 4c4df43..befbd32 100644 --- a/main.c +++ b/main.c @@ -79,7 +79,7 @@ int main(int argc, char *argv[]) if (strcmp(cmd, "markdown") == 0) { /* undocumented, for testing only */ xs *c = xs_readall(stdin); - xs *fc = not_really_markdown(c, &fc); + xs *fc = not_really_markdown(c); printf("\n%s\n\n", fc); return 0; diff --git a/snac.h b/snac.h index 16ef81c..bff5da4 100644 --- a/snac.h +++ b/snac.h @@ -135,7 +135,7 @@ int activitypub_post_handler(d_char *req, char *q_path, char *payload, int p_size, char **body, int *b_size, char **ctype); -d_char *not_really_markdown(char *content, d_char **f_content); +d_char *not_really_markdown(char *content); d_char *sanitize(d_char *str); int html_get_handler(d_char *req, char *q_path, char **body, int *b_size, char **ctype);