monkee.ch/snac2
1
0
Fork 0
mirror of https://codeberg.org/grunfink/snac2.git synced 2024-11-22 13:25:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

Backport from xs.

Browse source
This commit is contained in:
default 2023-08-30 17:21:33 +02:00
parent 9279708af9
commit b5b59bd574
2 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
xs.h
View file

@ -603,6 +603,11 @@ xs_list *_xs_list_write_litem(xs_list *list, int offset, const char *mem, int ds
{ {
XS_ASSERT_TYPE(list, XSTYPE_LIST); XS_ASSERT_TYPE(list, XSTYPE_LIST);
if (mem == NULL) {
mem = xs_stock_null;
dsz = sizeof(xs_stock_null);
}
list = xs_expand(list, offset, dsz + 1); list = xs_expand(list, offset, dsz + 1);
list[offset] = XSTYPE_LITEM; list[offset] = XSTYPE_LITEM;
@ -899,13 +904,18 @@ xs_dict *xs_dict_new(void)
} }
xs_dict *xs_dict_insert_m(xs_dict *dict, int offset, const xs_str *key, xs_dict *_xs_dict_write_ditem(xs_dict *dict, int offset, const xs_str *key,
const xs_val *data, int dsz) const xs_val *data, int dsz)
/* inserts a memory block into the dict */ /* inserts a memory block into the dict */
{ {
XS_ASSERT_TYPE(dict, XSTYPE_DICT); XS_ASSERT_TYPE(dict, XSTYPE_DICT);
XS_ASSERT_TYPE(key, XSTYPE_STRING); XS_ASSERT_TYPE(key, XSTYPE_STRING);
if (data == NULL) {
data = xs_stock_null;
dsz = sizeof(xs_stock_null);
}
int ksz = xs_size(key); int ksz = xs_size(key);
dict = xs_expand(dict, offset, 1 + ksz + dsz); dict = xs_expand(dict, offset, 1 + ksz + dsz);
@ -921,14 +931,14 @@ xs_dict *xs_dict_insert_m(xs_dict *dict, int offset, const xs_str *key,
xs_dict *xs_dict_append_m(xs_dict *dict, const xs_str *key, const xs_val *mem, int dsz) xs_dict *xs_dict_append_m(xs_dict *dict, const xs_str *key, const xs_val *mem, int dsz)
/* appends a memory block to the dict */ /* appends a memory block to the dict */
{ {
return xs_dict_insert_m(dict, xs_size(dict) - 1, key, mem, dsz); return _xs_dict_write_ditem(dict, xs_size(dict) - 1, key, mem, dsz);
} }
xs_dict *xs_dict_prepend_m(xs_dict *dict, const xs_str *key, const xs_val *mem, int dsz) xs_dict *xs_dict_prepend_m(xs_dict *dict, const xs_str *key, const xs_val *mem, int dsz)
/* prepends a memory block to the dict */ /* prepends a memory block to the dict */
{ {
return xs_dict_insert_m(dict, 4, key, mem, dsz); return _xs_dict_write_ditem(dict, 4, key, mem, dsz);
} }

2
xs_version.h
View file

@ -1 +1 @@
/* f42504297420abef44904644524207f8a1440494 */ /* ce9e43569a7dd29a85c807e496c335cc4999bafd */