commit f2528c6
default
·
2022-11-24 07:47:02 +0000 UTC
parent 1941d00
Backport from xs.
5 files changed,
+9,
-6
M
xs.h
+4,
-1
1@@ -34,6 +34,9 @@ typedef char d_char;
2 /* auto-destroyable strings */
3 #define xs __attribute__ ((__cleanup__ (_xs_destroy))) d_char
4
5+/* not really all, just very much */
6+#define XS_ALL 0xfffffff
7+
8 void *xs_free(void *ptr);
9 void *_xs_realloc(void *ptr, size_t size, const char *file, int line, const char *func);
10 #define xs_realloc(ptr, size) _xs_realloc(ptr, size, __FILE__, __LINE__, __FUNCTION__)
11@@ -74,7 +77,7 @@ d_char *xs_list_pop(d_char *list, char **data);
12 int xs_list_in(char *list, const char *val);
13 d_char *xs_join(char *list, const char *sep);
14 d_char *xs_split_n(const char *str, const char *sep, int times);
15-#define xs_split(str, sep) xs_split_n(str, sep, 0xfffffff)
16+#define xs_split(str, sep) xs_split_n(str, sep, XS_ALL)
17 d_char *xs_dict_new(void);
18 d_char *xs_dict_append_m(d_char *dict, const char *key, const char *mem, int dsz);
19 #define xs_dict_append(dict, key, data) xs_dict_append_m(dict, key, data, xs_size(data))
+1,
-1
1@@ -5,7 +5,7 @@
2 #define _XS_GLOB_H
3
4 d_char *xs_glob_n(const char *spec, int basename, int reverse, int max);
5-#define xs_glob(spec, basename, reverse) xs_glob_n(spec, basename, reverse, 0xfffffff)
6+#define xs_glob(spec, basename, reverse) xs_glob_n(spec, basename, reverse, XS_ALL)
7
8
9 #ifdef XS_IMPLEMENTATION
M
xs_io.h
+1,
-1
1@@ -79,7 +79,7 @@ d_char *xs_read(FILE *f, int *sz)
2 d_char *xs_readall(FILE *f)
3 /* reads the rest of the file into a string */
4 {
5- int size = 0xfffffff;
6+ int size = XS_ALL;
7
8 return xs_read(f, &size);
9 }
+2,
-2
1@@ -5,9 +5,9 @@
2 #define _XS_REGEX_H
3
4 d_char *xs_regex_split_n(const char *str, const char *rx, int count);
5-#define xs_regex_split(str, rx) xs_regex_split_n(str, rx, 0xfffffff)
6+#define xs_regex_split(str, rx) xs_regex_split_n(str, rx, XS_ALL)
7 d_char *xs_regex_match_n(const char *str, const char *rx, int count);
8-#define xs_regex_match(str, rx) xs_regex_match_n(str, rx, 0xfffffff)
9+#define xs_regex_match(str, rx) xs_regex_match_n(str, rx, XS_ALL)
10
11 #ifdef XS_IMPLEMENTATION
12
+1,
-1
1@@ -1 +1 @@
2-/* a78beb97d364ff31cbaa504e275118afeaea7a59 */
3+/* 2c01845d968c01c84aa52ff00ed029d9277c2d9c */