summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar default2023-08-13 12:09:35 +0200
committerGravatar default2023-08-13 12:09:35 +0200
commita0906208ea3906b3820307aa4bfe811b8d2eadb6 (patch)
treee5cf16535586b3e197cb72141009b620f5ab0fc5
parentUpdated RELEASE_NOTES. (diff)
downloadsnac2-a0906208ea3906b3820307aa4bfe811b8d2eadb6.tar.gz
snac2-a0906208ea3906b3820307aa4bfe811b8d2eadb6.tar.xz
snac2-a0906208ea3906b3820307aa4bfe811b8d2eadb6.zip
Use some new xs_stock values.
-rw-r--r--activitypub.c6
-rw-r--r--mastoapi.c15
-rw-r--r--xs.h9
-rw-r--r--xs_version.h2
4 files changed, 17 insertions, 15 deletions
diff --git a/activitypub.c b/activitypub.c
index 6fb6bf5..8b80683 100644
--- a/activitypub.c
+++ b/activitypub.c
@@ -820,11 +820,10 @@ xs_dict *msg_collection(snac *snac, char *id)
820{ 820{
821 xs_dict *msg = msg_base(snac, "OrderedCollection", id, NULL, NULL, NULL); 821 xs_dict *msg = msg_base(snac, "OrderedCollection", id, NULL, NULL, NULL);
822 xs *ol = xs_list_new(); 822 xs *ol = xs_list_new();
823 xs *nz = xs_number_new(0);
824 823
825 msg = xs_dict_append(msg, "attributedTo", snac->actor); 824 msg = xs_dict_append(msg, "attributedTo", snac->actor);
826 msg = xs_dict_append(msg, "orderedItems", ol); 825 msg = xs_dict_append(msg, "orderedItems", ol);
827 msg = xs_dict_append(msg, "totalItems", nz); 826 msg = xs_dict_append(msg, "totalItems", xs_stock_0);
828 827
829 return msg; 828 return msg;
830} 829}
@@ -1273,7 +1272,6 @@ int update_question(snac *user, const char *id)
1273{ 1272{
1274 xs *msg = NULL; 1273 xs *msg = NULL;
1275 xs *rcnt = xs_dict_new(); 1274 xs *rcnt = xs_dict_new();
1276 xs *z = xs_number_new(0);
1277 xs *lopts = xs_list_new(); 1275 xs *lopts = xs_list_new();
1278 xs_list *opts; 1276 xs_list *opts;
1279 xs_list *p; 1277 xs_list *p;
@@ -1298,7 +1296,7 @@ int update_question(snac *user, const char *id)
1298 const char *name = xs_dict_get(v, "name"); 1296 const char *name = xs_dict_get(v, "name");
1299 if (name) { 1297 if (name) {
1300 lopts = xs_list_append(lopts, name); 1298 lopts = xs_list_append(lopts, name);
1301 rcnt = xs_dict_set(rcnt, name, z); 1299 rcnt = xs_dict_set(rcnt, name, xs_stock_0);
1302 } 1300 }
1303 } 1301 }
1304 1302
diff --git a/mastoapi.c b/mastoapi.c
index b6a0e49..99e78ea 100644
--- a/mastoapi.c
+++ b/mastoapi.c
@@ -1462,19 +1462,16 @@ int mastoapi_get_handler(const xs_dict *req, const char *q_path,
1462 1462
1463 ins = xs_dict_append(ins, "email", v); 1463 ins = xs_dict_append(ins, "email", v);
1464 1464
1465 xs *l1 = xs_list_new(); 1465 ins = xs_dict_append(ins, "rules", xs_stock_list);
1466 ins = xs_dict_append(ins, "rules", l1);
1467 1466
1468 l1 = xs_list_append(l1, "en"); 1467 xs *l1 = xs_list_append(xs_list_new(), "en");
1469 ins = xs_dict_append(ins, "languages", l1); 1468 ins = xs_dict_append(ins, "languages", l1);
1470 1469
1471 xs *d1 = xs_dict_new(); 1470 ins = xs_dict_append(ins, "urls", xs_stock_dict);
1472 ins = xs_dict_append(ins, "urls", d1);
1473 1471
1474 xs *z = xs_number_new(0); 1472 xs *d2 = xs_dict_append(xs_dict_new(), "user_count", xs_stock_0);
1475 xs *d2 = xs_dict_append(xs_dict_new(), "user_count", z); 1473 d2 = xs_dict_append(d2, "status_count", xs_stock_0);
1476 d2 = xs_dict_append(d2, "status_count", z); 1474 d2 = xs_dict_append(d2, "domain_count", xs_stock_0);
1477 d2 = xs_dict_append(d2, "domain_count", z);
1478 ins = xs_dict_append(ins, "stats", d2); 1475 ins = xs_dict_append(ins, "stats", d2);
1479 1476
1480 ins = xs_dict_append(ins, "registrations", xs_stock_false); 1477 ins = xs_dict_append(ins, "registrations", xs_stock_false);
diff --git a/xs.h b/xs.h
index 35ddba8..a9064e0 100644
--- a/xs.h
+++ b/xs.h
@@ -137,6 +137,10 @@ unsigned int xs_hash_func(const char *data, int size);
137extern xs_val xs_stock_null[]; 137extern xs_val xs_stock_null[];
138extern xs_val xs_stock_true[]; 138extern xs_val xs_stock_true[];
139extern xs_val xs_stock_false[]; 139extern xs_val xs_stock_false[];
140extern xs_val xs_stock_0[];
141extern xs_val xs_stock_1[];
142extern xs_val xs_stock_list[];
143extern xs_val xs_stock_dict[];
140 144
141#define xs_return(v) xs_val *__r = v; v = NULL; return __r 145#define xs_return(v) xs_val *__r = v; v = NULL; return __r
142 146
@@ -146,7 +150,10 @@ extern xs_val xs_stock_false[];
146xs_val xs_stock_null[] = { XSTYPE_NULL }; 150xs_val xs_stock_null[] = { XSTYPE_NULL };
147xs_val xs_stock_true[] = { XSTYPE_TRUE }; 151xs_val xs_stock_true[] = { XSTYPE_TRUE };
148xs_val xs_stock_false[] = { XSTYPE_FALSE }; 152xs_val xs_stock_false[] = { XSTYPE_FALSE };
149 153xs_val xs_stock_0[] = { XSTYPE_NUMBER, '0', '\0' };
154xs_val xs_stock_1[] = { XSTYPE_NUMBER, '1', '\0' };
155xs_val xs_stock_list[] = { XSTYPE_LIST, 0, 0, 5, XSTYPE_EOM };
156xs_val xs_stock_dict[] = { XSTYPE_DICT, 0, 0, 5, XSTYPE_EOM };
150 157
151void *_xs_realloc(void *ptr, size_t size, const char *file, int line, const char *func) 158void *_xs_realloc(void *ptr, size_t size, const char *file, int line, const char *func)
152{ 159{
diff --git a/xs_version.h b/xs_version.h
index 1a7656a..0fd2972 100644
--- a/xs_version.h
+++ b/xs_version.h
@@ -1 +1 @@
/* 59b0a9da6a6b6258ab003ab71d790d2879cd2e31 */ /* 6cb05184b1aafc2740758de5422d70df51e01b66 */