commit 88fc843

Use xs_between() where applicable.

 1@@ -3324,11 +3324,11 @@ int mastoapi_patch_handler(const xs_dict *req, const char *q_path,
 2                     persist_image("avatar", v, payload, &snac);
 3                 }
 4                 else
 5-                if (xs_starts_and_ends("fields_attributes", k, "[name]")) {
 6+                if (xs_between("fields_attributes", k, "[name]")) {
 7                     field_name = strcmp(v, "") != 0 ? v : NULL;
 8                 }
 9                 else
10-                if (xs_starts_and_ends("fields_attributes", k, "[value]")) {
11+                if (xs_between("fields_attributes", k, "[value]")) {
12                     if (field_name != NULL) {
13                         new_fields = xs_dict_set(new_fields, field_name, v);
14                         snac.config = xs_dict_set(snac.config, "metadata", new_fields);

 1@@ -80,9 +80,9 @@ xs_str *xs_replace_in(xs_str *str, const char *sfrom, const char *sto, int times
 2 #define xs_replace_n(str, sfrom, sto, times) xs_replace_in(xs_dup(str), sfrom, sto, times)
 3 xs_str *xs_fmt(const char *fmt, ...);
 4 int xs_str_in(const char *haystack, const char *needle);
 5-int xs_starts_and_ends(const char *prefix, const char *str, const char *suffix);
 6-#define xs_startswith(str, prefix) xs_starts_and_ends(prefix, str, NULL)
 7-#define xs_endswith(str, suffix) xs_starts_and_ends(NULL, str, suffix)
 8+int xs_between(const char *prefix, const char *str, const char *suffix);
 9+#define xs_startswith(str, prefix) xs_between(prefix, str, NULL)
10+#define xs_endswith(str, suffix) xs_between(NULL, str, suffix)
11 xs_str *xs_crop_i(xs_str *str, int start, int end);
12 xs_str *xs_lstrip_chars_i(xs_str *str, const char *chars);
13 xs_str *xs_rstrip_chars_i(xs_str *str, const char *chars);
14@@ -586,7 +586,7 @@ int xs_str_in(const char *haystack, const char *needle)
15 }
16 
17 
18-int xs_starts_and_ends(const char *prefix, const char *str, const char *suffix)
19+int xs_between(const char *prefix, const char *str, const char *suffix)
20 /* returns true if str starts with prefix and ends with suffix */
21 {
22     int sz = strlen(str);

1@@ -109,7 +109,7 @@ xs_dict *xs_multipart_form_data(const char *payload, int p_size, const char *hea
2         boundary = xs_dup(xs_list_get(l1, 1));
3 
4         /* Tokodon sends the boundary header with double quotes surrounded */
5-        if (xs_starts_and_ends("\"", boundary, "\"") != 0)
6+        if (xs_between("\"", boundary, "\"") != 0)
7             boundary = xs_strip_chars_i(boundary, "\"");
8 
9         boundary = xs_fmt("--%s", boundary);

1@@ -1 +1 @@
2-/* fb6646ef1b1d5f24768bc829680eb70272755584 2024-08-05T05:32:08+02:00 */
3+/* 3536c4e2ab0849eccf81c50741028453e9ad7f3a 2024-08-05T18:37:46+02:00 */