commit a090620

default  ·  2023-08-13 10:09:35 +0000 UTC
parent 5bec358 
Use some new xs_stock values.
4 files changed,  +17, -15
M activitypub.c
M mastoapi.c
M xs.h
M xs_version.h
M activitypub.c
+2, -4 
 1@@ -820,11 +820,10 @@ xs_dict *msg_collection(snac *snac, char *id)
 2 {
 3     xs_dict *msg = msg_base(snac, "OrderedCollection", id, NULL, NULL, NULL);
 4     xs *ol = xs_list_new();
 5-    xs *nz = xs_number_new(0);
 6 
 7     msg = xs_dict_append(msg, "attributedTo", snac->actor);
 8     msg = xs_dict_append(msg, "orderedItems", ol);
 9-    msg = xs_dict_append(msg, "totalItems",   nz);
10+    msg = xs_dict_append(msg, "totalItems",   xs_stock_0);
11 
12     return msg;
13 }
14@@ -1273,7 +1272,6 @@ int update_question(snac *user, const char *id)
15 {
16     xs *msg   = NULL;
17     xs *rcnt  = xs_dict_new();
18-    xs *z     = xs_number_new(0);
19     xs *lopts = xs_list_new();
20     xs_list *opts;
21     xs_list *p;
22@@ -1298,7 +1296,7 @@ int update_question(snac *user, const char *id)
23         const char *name = xs_dict_get(v, "name");
24         if (name) {
25             lopts = xs_list_append(lopts, name);
26-            rcnt  = xs_dict_set(rcnt, name, z);
27+            rcnt  = xs_dict_set(rcnt, name, xs_stock_0);
28         }
29     }
30
M mastoapi.c
+6, -9 
 1@@ -1462,19 +1462,16 @@ int mastoapi_get_handler(const xs_dict *req, const char *q_path,
 2 
 3         ins = xs_dict_append(ins, "email", v);
 4 
 5-        xs *l1 = xs_list_new();
 6-        ins = xs_dict_append(ins, "rules", l1);
 7+        ins = xs_dict_append(ins, "rules", xs_stock_list);
 8 
 9-        l1 = xs_list_append(l1, "en");
10+        xs *l1 = xs_list_append(xs_list_new(), "en");
11         ins = xs_dict_append(ins, "languages", l1);
12 
13-        xs *d1 = xs_dict_new();
14-        ins = xs_dict_append(ins, "urls", d1);
15+        ins = xs_dict_append(ins, "urls", xs_stock_dict);
16 
17-        xs *z = xs_number_new(0);
18-        xs *d2 = xs_dict_append(xs_dict_new(), "user_count", z);
19-        d2 = xs_dict_append(d2, "status_count", z);
20-        d2 = xs_dict_append(d2, "domain_count", z);
21+        xs *d2 = xs_dict_append(xs_dict_new(), "user_count", xs_stock_0);
22+        d2 = xs_dict_append(d2, "status_count", xs_stock_0);
23+        d2 = xs_dict_append(d2, "domain_count", xs_stock_0);
24         ins = xs_dict_append(ins, "stats", d2);
25 
26         ins = xs_dict_append(ins, "registrations",     xs_stock_false);
M xs.h
+8, -1 
 1@@ -137,6 +137,10 @@ unsigned int xs_hash_func(const char *data, int size);
 2 extern xs_val xs_stock_null[];
 3 extern xs_val xs_stock_true[];
 4 extern xs_val xs_stock_false[];
 5+extern xs_val xs_stock_0[];
 6+extern xs_val xs_stock_1[];
 7+extern xs_val xs_stock_list[];
 8+extern xs_val xs_stock_dict[];
 9 
10 #define xs_return(v) xs_val *__r = v; v = NULL; return __r
11 
12@@ -146,7 +150,10 @@ extern xs_val xs_stock_false[];
13 xs_val xs_stock_null[]  = { XSTYPE_NULL };
14 xs_val xs_stock_true[]  = { XSTYPE_TRUE };
15 xs_val xs_stock_false[] = { XSTYPE_FALSE };
16-
17+xs_val xs_stock_0[]     = { XSTYPE_NUMBER, '0', '\0' };
18+xs_val xs_stock_1[]     = { XSTYPE_NUMBER, '1', '\0' };
19+xs_val xs_stock_list[]  = { XSTYPE_LIST, 0, 0, 5, XSTYPE_EOM };
20+xs_val xs_stock_dict[]  = { XSTYPE_DICT, 0, 0, 5, XSTYPE_EOM };
21 
22 void *_xs_realloc(void *ptr, size_t size, const char *file, int line, const char *func)
23 {
M xs_version.h
+1, -1 
1@@ -1 +1 @@
2-/* 59b0a9da6a6b6258ab003ab71d790d2879cd2e31 */
3+/* 6cb05184b1aafc2740758de5422d70df51e01b66 */