commit 144eb7b

grunfink  ·  2025-09-23 07:01:55 +0000 UTC
parents 8e58a6b, d23ac2b 
Merge pull request 'making sure that global data is immutable' (#477) from byte/snac2:fix/immutable into master

Reviewed-on: https://codeberg.org/grunfink/snac2/pulls/477
5 files changed,  +14, -14
M activitypub.c
M format.c
M httpd.c
M mastoapi.c
M utils.c
M activitypub.c
+4, -4 
 1@@ -17,25 +17,25 @@
 2 
 3 #include <sys/wait.h>
 4 
 5-const char *public_address = "https:/" "/www.w3.org/ns/activitystreams#Public";
 6+const char * const public_address = "https:/" "/www.w3.org/ns/activitystreams#Public";
 7 
 8 /* susie.png */
 9 
10-const char *susie =
11+const char * const susie =
12     "iVBORw0KGgoAAAANSUhEUgAAAEAAAABAAQAAAAC"
13     "CEkxzAAAAUUlEQVQoz43R0QkAMQwCUDdw/y3dwE"
14     "vsvzlL4X1IoQkAisKmwfAFT3RgJHbQezpSRoXEq"
15     "eqCL9BJBf7h3QbOCCxV5EVWMEMwG7K1/WODtlvx"
16     "AYTtEsDU9F34AAAAAElFTkSuQmCC";
17 
18-const char *susie_cool =
19+const char * const susie_cool =
20     "iVBORw0KGgoAAAANSUhEUgAAAEAAAABAAQAAAAC"
21     "CEkxzAAAAV0lEQVQoz43RwQ3AMAwCQDZg/y3ZgN"
22     "qo3+JaedwDOUQBQFHYaTB8wTM6sGl2cMPu+DFzn"
23     "+ZcgN7wF7ZVihXkfSlWIVzIA6dbQzaygllpNuTX"
24     "ZmmFNlvxADX1+o0cUPMbAAAAAElFTkSuQmCC";
25 
26-const char *susie_muertos =
27+const char * const susie_muertos =
28     "iVBORw0KGgoAAAANSUhEUgAAAEAAAABAAQAAAAC"
29     "CEkxzAAAAV0lEQVQoz4XQsQ0AMQxCUW/A/lv+DT"
30     "ic6zGRolekIMyMELNp8PiCEw6Q4w4NoAt53IH5m"
M format.c
+3, -3 
 1@@ -13,7 +13,7 @@
 2 #include "snac.h"
 3 
 4 /* emoticons, people laughing and such */
 5-const char *smileys[] = {
 6+const char * const smileys[] = {
 7     ":-)",        "&#128578;",
 8     ":-D",        "&#128512;",
 9     "X-D",        "&#128518;",
10@@ -49,7 +49,7 @@ xs_dict *emojis(void)
11     if (mtime(fn) == 0) {
12         /* file does not exist; create it with the defaults */
13         xs *d = xs_dict_new();
14-        const char **emo = smileys;
15+        const char * const *emo = smileys;
16 
17         while (*emo) {
18             d = xs_dict_append(d, emo[0], emo[1]);
19@@ -443,7 +443,7 @@ xs_str *not_really_markdown(const char *content, xs_list **attach, xs_list **tag
20 }
21 
22 
23-const char *valid_tags[] = {
24+const char * const valid_tags[] = {
25     "a", "p", "br", "br/", "blockquote", "ul", "ol", "li", "cite", "small",
26     "span", "i", "b", "u", "s", "pre", "code", "em", "strong", "hr", "img", "del", "bdi",
27     "h2","h3", //anzu
M httpd.c
+3, -3 
 1@@ -59,7 +59,7 @@ static jmp_buf on_break;
 2 /** code **/
 3 
 4 /* nodeinfo 2.0 template */
 5-const char *nodeinfo_2_0_template = ""
 6+const char * const nodeinfo_2_0_template = ""
 7     "{\"version\":\"2.0\","
 8     "\"software\":{\"name\":\"snac\",\"version\":\"" VERSION "\"},"
 9     "\"protocols\":[\"activitypub\"],"
10@@ -172,7 +172,7 @@ static xs_str *greeting_html(void)
11 }
12 
13 
14-const char *share_page = ""
15+const char * const share_page = ""
16 "<!DOCTYPE html>\n"
17 "<html>\n"
18 "<head>\n"
19@@ -190,7 +190,7 @@ const char *share_page = ""
20 "";
21 
22 
23-const char *authorize_interaction_page = ""
24+const char * const authorize_interaction_page = ""
25 "<!DOCTYPE html>\n"
26 "<html>\n"
27 "<head>\n"
M mastoapi.c
+1, -1 
1@@ -161,7 +161,7 @@ int token_del(const char *id)
2 }
3 
4 
5-const char *login_page = ""
6+const char * const login_page = ""
7 "<!DOCTYPE html>\n"
8 "<html>\n"
9 "<head>\n"
M utils.c
+3, -3 
 1@@ -16,7 +16,7 @@
 2 #include <sys/stat.h>
 3 #include <stdlib.h>
 4 
 5-static const char *default_srv_config = "{"
 6+static const char * const default_srv_config = "{"
 7     "\"host\":                 \"\","
 8     "\"prefix\":               \"\","
 9     "\"address\":              \"127.0.0.1\","
10@@ -42,7 +42,7 @@ static const char *default_srv_config = "{"
11     "\"fastcgi\":              false"
12     "}";
13 
14-static const char *default_css =
15+static const char * const default_css =
16     "body { max-width: 48em; margin: auto; line-height: 1.5; padding: 0.8em; word-wrap: break-word; }\n"
17     "pre { overflow-x: scroll; }\n"
18     "blockquote { font-style: italic; }\n"
19@@ -97,7 +97,7 @@ const char *snac_blurb =
20     "automatic sign-up process.</p>\n"
21 ;
22 
23-static const char *greeting_html =
24+static const char * const greeting_html =
25     "<!DOCTYPE html>\n"
26     "<html><head>\n"
27     "<meta name=\"viewport\" content=\"width=device-width, initial-scale=1\"/>\n"