SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

alloc-util: Move strdupa_safe() and strndupa_safe() to string-util.h

Browse Source
This commit is contained in:
Daan De Meyer
2025-05-06 15:42:01 +02:00
parent e4a08721c3
commit 02207b54d5
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/basic/alloc-util.h
-13
View File
@@ -223,19 +223,6 @@ static inline size_t malloc_sizeof_safe(void **xp) {
MALLOC_SIZEOF_SAFE(x)/sizeof((x)[0]), \
VOID_0))
/* These are like strdupa()/strndupa(), but honour ALLOCA_MAX */
#define strdupa_safe(s) \
({ \
const char *_t = (s); \
(char*) memdupa_suffix0(_t, strlen(_t)); \
})
#define strndupa_safe(s, n) \
({ \
const char *_t = (s); \
(char*) memdupa_suffix0(_t, strnlen(_t, n)); \
})
/* Free every element of the array. */
static inline void free_many(void **p, size_t n) {
assert(p || n == 0);
src/basic/string-util.h
+13
View File
@@ -280,6 +280,19 @@ size_t strspn_from_end(const char *str, const char *accept);
char* strdupspn(const char *a, const char *accept);
char* strdupcspn(const char *a, const char *reject);
/* These are like strdupa()/strndupa(), but honour ALLOCA_MAX */
#define strdupa_safe(s) \
({ \
const char *_t = (s); \
(char*) memdupa_suffix0(_t, strlen(_t)); \
})
#define strndupa_safe(s, n) \
({ \
const char *_t = (s); \
(char*) memdupa_suffix0(_t, strnlen(_t, n)); \
})
char* find_line_startswith(const char *haystack, const char *needle);
bool version_is_valid(const char *s);