summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar default2022-09-27 10:20:33 +0200
committerGravatar default2022-09-27 10:20:33 +0200
commit48a50770f46f160d8cbc852fdb90ea0c6c74cdd7 (patch)
treecfebe9305575252a0ce6dd3192dab1ab00b3802f
parentUpdated dependencies. (diff)
downloadpenes-snac2-48a50770f46f160d8cbc852fdb90ea0c6c74cdd7.tar.gz
penes-snac2-48a50770f46f160d8cbc852fdb90ea0c6c74cdd7.tar.xz
penes-snac2-48a50770f46f160d8cbc852fdb90ea0c6c74cdd7.zip
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)
63 s = xs_str_cat(s, "</pre>"); 63 s = xs_str_cat(s, "</pre>");
64 64
65 /* some beauty fixes */ 65 /* some beauty fixes */
66 if (xs_str_in(s, "</blockquote><br>") != -1) { 66 s = xs_replace_i(s, "</blockquote><br>", "</blockquote>");
67 xs *os = s;
68 s = xs_replace(os, "</blockquote><br>", "</blockquote>");
69 }
70 67
71 *f_content = s; 68 *f_content = s;
72 69
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,
47 xs *list = user_list(); 47 xs *list = user_list();
48 char *p, *uid; 48 char *p, *uid;
49 xs *ul = xs_str_new("<ul class=\"snac-user-list\">\n"); 49 xs *ul = xs_str_new("<ul class=\"snac-user-list\">\n");
50 xs *os = s;
51 50
52 p = list; 51 p = list;
53 while (xs_list_iter(&p, &uid)) { 52 while (xs_list_iter(&p, &uid)) {
@@ -67,7 +66,7 @@ int server_get_handler(d_char *req, char *q_path,
67 66
68 ul = xs_str_cat(ul, "</ul>\n"); 67 ul = xs_str_cat(ul, "</ul>\n");
69 68
70 s = xs_replace(os, "%userlist%", ul); 69 s = xs_replace_i(s, "%userlist%", ul);
71 } 70 }
72 71
73 *body = s; 72 *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)
77 77
78 if (xs_str_in(msg, srv_basedir) != -1) { 78 if (xs_str_in(msg, srv_basedir) != -1) {
79 /* replace basedir with ~ */ 79 /* replace basedir with ~ */
80 xs *o_str = msg; 80 msg = xs_replace_i(msg, srv_basedir, "~");
81 msg = xs_replace(o_str, srv_basedir, "~");
82 } 81 }
83 82
84 if (dbglevel >= level) { 83 if (dbglevel >= level) {
@@ -96,8 +95,7 @@ void snac_debug(snac *snac, int level, d_char *str)
96 95
97 if (xs_str_in(msg, snac->basedir) != -1) { 96 if (xs_str_in(msg, snac->basedir) != -1) {
98 /* replace long basedir references with ~ */ 97 /* replace long basedir references with ~ */
99 xs *o_str = msg; 98 msg = xs_replace_i(msg, snac->basedir, "~");
100 msg = xs_replace(o_str, snac->basedir, "~");
101 } 99 }
102 100
103 srv_debug(level, msg); 101 srv_debug(level, msg);