summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordefault <nobody@localhost>2022-09-27 10:20:33 +0200
committerdefault <nobody@localhost>2022-09-27 10:20:33 +0200
commit48a50770f46f160d8cbc852fdb90ea0c6c74cdd7 (patch)
treecfebe9305575252a0ce6dd3192dab1ab00b3802f
parentc41f982eea0c2fcb75b412e4e85a7df25cbc9e0f (diff)
Use xs_replace_i() in some places.
-rw-r--r--html.c5
-rw-r--r--httpd.c3
-rw-r--r--snac.c6
3 files changed, 4 insertions, 10 deletions
diff --git a/html.c b/html.c
index de9060c..532c033 100644
--- a/html.c
+++ b/html.c
@@ -63,10 +63,7 @@ d_char *not_really_markdown(char *content, d_char **f_content)
s = xs_str_cat(s, "</pre>");
/* some beauty fixes */
- if (xs_str_in(s, "</blockquote><br>") != -1) {
- xs *os = s;
- s = xs_replace(os, "</blockquote><br>", "</blockquote>");
- }
+ s = xs_replace_i(s, "</blockquote><br>", "</blockquote>");
*f_content = s;
diff --git a/httpd.c b/httpd.c
index 256d7b1..3746a7f 100644
--- a/httpd.c
+++ b/httpd.c
@@ -47,7 +47,6 @@ int server_get_handler(d_char *req, char *q_path,
xs *list = user_list();
char *p, *uid;
xs *ul = xs_str_new("<ul class=\"snac-user-list\">\n");
- xs *os = s;
p = list;
while (xs_list_iter(&p, &uid)) {
@@ -67,7 +66,7 @@ int server_get_handler(d_char *req, char *q_path,
ul = xs_str_cat(ul, "</ul>\n");
- s = xs_replace(os, "%userlist%", ul);
+ s = xs_replace_i(s, "%userlist%", ul);
}
*body = s;
diff --git a/snac.c b/snac.c
index 7063b4c..04c5944 100644
--- a/snac.c
+++ b/snac.c
@@ -77,8 +77,7 @@ void srv_debug(int level, d_char *str)
if (xs_str_in(msg, srv_basedir) != -1) {
/* replace basedir with ~ */
- xs *o_str = msg;
- msg = xs_replace(o_str, srv_basedir, "~");
+ msg = xs_replace_i(msg, srv_basedir, "~");
}
if (dbglevel >= level) {
@@ -96,8 +95,7 @@ void snac_debug(snac *snac, int level, d_char *str)
if (xs_str_in(msg, snac->basedir) != -1) {
/* replace long basedir references with ~ */
- xs *o_str = msg;
- msg = xs_replace(o_str, snac->basedir, "~");
+ msg = xs_replace_i(msg, snac->basedir, "~");
}
srv_debug(level, msg);