packages/systemd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
systemd/backport-basic-strv-inline-variables-and-modernize-style-a-bi.patch

454 lines
14 KiB
Diff
Raw Blame History

From 14337c374a641badf55cf9ce6ec1fb387886b651 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Fri, 26 Nov 2021 09:47:44 +0100
Subject: [PATCH] basic/strv: inline variables and modernize style a bit
Conflict:Context Adaptation.
Reference:https://github.com/systemd/systemd/commit/14337c374a641badf55cf9ce6ec1fb387886b651
---
src/basic/strv.c | 82 +++++++++++++++++++++---------------------------
src/basic/strv.h | 42 ++++++++++++-------------
2 files changed, 56 insertions(+), 68 deletions(-)
diff --git a/src/basic/strv.c b/src/basic/strv.c
index 3adf3c5..e10af33 100644
--- a/src/basic/strv.c
+++ b/src/basic/strv.c
@@ -16,7 +16,7 @@
#include "string-util.h"
#include "strv.h"
-char *strv_find(char * const *l, const char *name) {
+char* strv_find(char * const *l, const char *name) {
char * const *i;
assert(name);
@@ -28,7 +28,7 @@ char *strv_find(char * const *l, const char *name) {
return NULL;
}
-char *strv_find_case(char * const *l, const char *name) {
+char* strv_find_case(char * const *l, const char *name) {
char * const *i;
assert(name);
@@ -40,7 +40,7 @@ char *strv_find_case(char * const *l, const char *name) {
return NULL;
}
-char *strv_find_prefix(char * const *l, const char *name) {
+char* strv_find_prefix(char * const *l, const char *name) {
char * const *i;
assert(name);
@@ -52,7 +52,7 @@ char *strv_find_prefix(char * const *l, const char *name) {
return NULL;
}
-char *strv_find_startswith(char * const *l, const char *name) {
+char* strv_find_startswith(char * const *l, const char *name) {
char * const *i, *e;
assert(name);
@@ -69,19 +69,17 @@ char *strv_find_startswith(char * const *l, const char *name) {
return NULL;
}
-char **strv_free(char **l) {
- char **k;
-
+char** strv_free(char **l) {
if (!l)
return NULL;
- for (k = l; *k; k++)
+ for (char **k = l; *k; k++)
free(*k);
return mfree(l);
}
-char **strv_free_erase(char **l) {
+char** strv_free_erase(char **l) {
char **i;
STRV_FOREACH(i, l)
@@ -90,7 +88,7 @@ char **strv_free_erase(char **l) {
return mfree(l);
}
-char **strv_copy(char * const *l) {
+char** strv_copy(char * const *l) {
char **r, **k;
k = r = new(char*, strv_length(l) + 1);
@@ -122,7 +120,7 @@ size_t strv_length(char * const *l) {
return n;
}
-char **strv_new_ap(const char *x, va_list ap) {
+char** strv_new_ap(const char *x, va_list ap) {
_cleanup_strv_free_ char **a = NULL;
size_t n = 0, i = 0;
va_list aq;
@@ -161,7 +159,7 @@ char **strv_new_ap(const char *x, va_list ap) {
return TAKE_PTR(a);
}
-char **strv_new_internal(const char *x, ...) {
+char** strv_new_internal(const char *x, ...) {
char **r;
va_list ap;
@@ -174,7 +172,7 @@ char **strv_new_internal(const char *x, ...) {
int strv_extend_strv(char ***a, char * const *b, bool filter_duplicates) {
char * const *s, **t;
- size_t p, q, i = 0, j;
+ size_t p, q, i = 0;
assert(a);
@@ -195,7 +193,6 @@ int strv_extend_strv(char ***a, char * const *b, bool filter_duplicates) {
*a = t;
STRV_FOREACH(s, b) {
-
if (filter_duplicates && strv_contains(t, *s))
continue;
@@ -212,7 +209,7 @@ int strv_extend_strv(char ***a, char * const *b, bool filter_duplicates) {
return (int) i;
rollback:
- for (j = 0; j < i; j++)
+ for (size_t j = 0; j < i; j++)
free(t[p + j]);
t[p] = NULL;
@@ -285,7 +282,6 @@ int strv_split_full(char ***t, const char *s, const char *separators, ExtractFla
return -ENOMEM;
l[n++] = TAKE_PTR(word);
-
l[n] = NULL;
}
@@ -352,7 +348,7 @@ int strv_split_colon_pairs(char ***t, const char *s) {
return (int) n;
}
-char *strv_join_full(char * const *l, const char *separator, const char *prefix, bool unescape_separators) {
+char* strv_join_full(char * const *l, const char *separator, const char *prefix, bool unescape_separators) {
char * const *s;
char *r, *e;
size_t n, k, m;
@@ -459,7 +455,7 @@ int strv_push_pair(char ***l, char *a, char *b) {
int strv_insert(char ***l, size_t position, char *value) {
char **c;
- size_t n, m, i;
+ size_t n, m;
if (!value)
return 0;
@@ -476,18 +472,14 @@ int strv_insert(char ***l, size_t position, char *value) {
if (!c)
return -ENOMEM;
- for (i = 0; i < position; i++)
+ for (size_t i = 0; i < position; i++)
c[i] = (*l)[i];
c[position] = value;
- for (i = position; i < n; i++)
+ for (size_t i = position; i < n; i++)
c[i+1] = (*l)[i];
-
c[n+1] = NULL;
- free(*l);
- *l = c;
-
- return 0;
+ return free_and_replace(*l, c);
}
int strv_consume(char ***l, char *value) {
@@ -584,7 +576,7 @@ int strv_extend_front(char ***l, const char *value) {
return 0;
}
-char **strv_uniq(char **l) {
+char** strv_uniq(char **l) {
char **i;
/* Drops duplicate entries. The first identical string will be
@@ -606,7 +598,7 @@ bool strv_is_uniq(char * const *l) {
return true;
}
-char **strv_remove(char **l, const char *s) {
+char** strv_remove(char **l, const char *s) {
char **f, **t;
if (!l)
@@ -627,7 +619,7 @@ char **strv_remove(char **l, const char *s) {
return l;
}
-char **strv_parse_nulstr(const char *s, size_t l) {
+char** strv_parse_nulstr(const char *s, size_t l) {
/* l is the length of the input data, which will be split at NULs into
* elements of the resulting strv. Hence, the number of items in the resulting strv
* will be equal to one plus the number of NUL bytes in the l bytes starting at s,
@@ -639,7 +631,6 @@ char **strv_parse_nulstr(const char *s, size_t l) {
* empty strings in s.
*/
- const char *p;
size_t c = 0, i = 0;
char **v;
@@ -648,7 +639,7 @@ char **strv_parse_nulstr(const char *s, size_t l) {
if (l <= 0)
return new0(char*, 1);
- for (p = s; p < s + l; p++)
+ for (const char *p = s; p < s + l; p++)
if (*p == 0)
c++;
@@ -659,8 +650,7 @@ char **strv_parse_nulstr(const char *s, size_t l) {
if (!v)
return NULL;
- p = s;
- while (p < s + l) {
+ for (const char *p = s; p < s + l; ) {
const char *e;
e = memchr(p, 0, s + l - p);
@@ -684,7 +674,7 @@ char **strv_parse_nulstr(const char *s, size_t l) {
return v;
}
-char **strv_split_nulstr(const char *s) {
+char** strv_split_nulstr(const char *s) {
const char *i;
char **r = NULL;
@@ -759,7 +749,7 @@ static int str_compare(char * const *a, char * const *b) {
return strcmp(*a, *b);
}
-char **strv_sort(char **l) {
+char** strv_sort(char **l) {
typesafe_qsort(l, strv_length(l), str_compare);
return l;
}
@@ -808,20 +798,20 @@ int strv_extendf(char ***l, const char *format, ...) {
return strv_consume(l, x);
}
-char **strv_reverse(char **l) {
- size_t n, i;
+char** strv_reverse(char **l) {
+ size_t n;
n = strv_length(l);
if (n <= 1)
return l;
- for (i = 0; i < n / 2; i++)
+ for (size_t i = 0; i < n / 2; i++)
SWAP_TWO(l[i], l[n-1-i]);
return l;
}
-char **strv_shell_escape(char **l, const char *bad) {
+char** strv_shell_escape(char **l, const char *bad) {
char **s;
/* Escapes every character in every string in l that is in bad,
@@ -852,19 +842,17 @@ bool strv_fnmatch_full(char* const* patterns, const char *s, int flags, size_t *
return false;
}
-char ***strv_free_free(char ***l) {
- char ***i;
-
+char*** strv_free_free(char ***l) {
if (!l)
return NULL;
- for (i = l; *i; i++)
+ for (char ***i = l; *i; i++)
strv_free(*i);
return mfree(l);
}
-char **strv_skip(char **l, size_t n) {
+char** strv_skip(char **l, size_t n) {
while (n > 0) {
if (strv_isempty(l))
@@ -877,7 +865,7 @@ char **strv_skip(char **l, size_t n) {
}
int strv_extend_n(char ***l, const char *value, size_t n) {
- size_t i, j, k;
+ size_t i, k;
char **nl;
assert(l);
@@ -904,15 +892,15 @@ int strv_extend_n(char ***l, const char *value, size_t n) {
if (!nl[i])
goto rollback;
}
-
nl[i] = NULL;
+
return 0;
rollback:
- for (j = k; j < i; j++)
+ for (size_t j = k; j < i; j++)
free(nl[j]);
-
nl[k] = NULL;
+
return -ENOMEM;
}
diff --git a/src/basic/strv.h b/src/basic/strv.h
index 911528f..8674bfd 100644
--- a/src/basic/strv.h
+++ b/src/basic/strv.h
@@ -13,23 +13,23 @@
#include "macro.h"
#include "string-util.h"
-char *strv_find(char * const *l, const char *name) _pure_;
-char *strv_find_case(char * const *l, const char *name) _pure_;
-char *strv_find_prefix(char * const *l, const char *name) _pure_;
-char *strv_find_startswith(char * const *l, const char *name) _pure_;
+char* strv_find(char * const *l, const char *name) _pure_;
+char* strv_find_case(char * const *l, const char *name) _pure_;
+char* strv_find_prefix(char * const *l, const char *name) _pure_;
+char* strv_find_startswith(char * const *l, const char *name) _pure_;
#define strv_contains(l, s) (!!strv_find((l), (s)))
#define strv_contains_case(l, s) (!!strv_find_case((l), (s)))
-char **strv_free(char **l);
+char** strv_free(char **l);
DEFINE_TRIVIAL_CLEANUP_FUNC(char**, strv_free);
#define _cleanup_strv_free_ _cleanup_(strv_freep)
-char **strv_free_erase(char **l);
+char** strv_free_erase(char **l);
DEFINE_TRIVIAL_CLEANUP_FUNC(char**, strv_free_erase);
#define _cleanup_strv_free_erase_ _cleanup_(strv_free_erasep)
-char **strv_copy(char * const *l);
+char** strv_copy(char * const *l);
size_t strv_length(char * const *l) _pure_;
int strv_extend_strv(char ***a, char * const *b, bool filter_duplicates);
@@ -50,8 +50,8 @@ int strv_consume(char ***l, char *value);
int strv_consume_pair(char ***l, char *a, char *b);
int strv_consume_prepend(char ***l, char *value);
-char **strv_remove(char **l, const char *s);
-char **strv_uniq(char **l);
+char** strv_remove(char **l, const char *s);
+char** strv_uniq(char **l);
bool strv_is_uniq(char * const *l);
int strv_compare(char * const *a, char * const *b);
@@ -59,8 +59,8 @@ static inline bool strv_equal(char * const *a, char * const *b) {
return strv_compare(a, b) == 0;
}
-char **strv_new_internal(const char *x, ...) _sentinel_;
-char **strv_new_ap(const char *x, va_list ap);
+char** strv_new_internal(const char *x, ...) _sentinel_;
+char** strv_new_ap(const char *x, va_list ap);
#define strv_new(...) strv_new_internal(__VA_ARGS__, NULL)
#define STRV_IGNORE ((const char *) POINTER_MAX)
@@ -74,7 +74,7 @@ static inline bool strv_isempty(char * const *l) {
}
int strv_split_full(char ***t, const char *s, const char *separators, ExtractFlags flags);
-static inline char **strv_split(const char *s, const char *separators) {
+static inline char** strv_split(const char *s, const char *separators) {
char **ret;
if (strv_split_full(&ret, s, separators, 0) < 0)
@@ -84,7 +84,7 @@ static inline char **strv_split(const char *s, const char *separators) {
}
int strv_split_newlines_full(char ***ret, const char *s, ExtractFlags flags);
-static inline char **strv_split_newlines(const char *s) {
+static inline char** strv_split_newlines(const char *s) {
char **ret;
if (strv_split_newlines_full(&ret, s, 0) < 0)
@@ -98,13 +98,13 @@ static inline char **strv_split_newlines(const char *s) {
* string in the vector is an empty string. */
int strv_split_colon_pairs(char ***t, const char *s);
-char *strv_join_full(char * const *l, const char *separator, const char *prefix, bool escape_separtor);
+char* strv_join_full(char * const *l, const char *separator, const char *prefix, bool escape_separtor);
static inline char *strv_join(char * const *l, const char *separator) {
return strv_join_full(l, separator, NULL, false);
}
-char **strv_parse_nulstr(const char *s, size_t l);
-char **strv_split_nulstr(const char *s);
+char** strv_parse_nulstr(const char *s, size_t l);
+char** strv_split_nulstr(const char *s);
int strv_make_nulstr(char * const *l, char **p, size_t *n);
static inline int strv_from_nulstr(char ***a, const char *nulstr) {
@@ -133,7 +133,7 @@ bool strv_overlap(char * const *a, char * const *b) _pure_;
#define STRV_FOREACH_PAIR(x, y, l) \
for ((x) = (l), (y) = (x) ? (x+1) : NULL; (x) && *(x) && *(y); (x) += 2, (y) = (x + 1))
-char **strv_sort(char **l);
+char** strv_sort(char **l);
void strv_print(char * const *l);
#define strv_from_stdarg_alloca(first) \
@@ -208,8 +208,8 @@ void strv_print(char * const *l);
x; \
x = *(++_l))
-char **strv_reverse(char **l);
-char **strv_shell_escape(char **l, const char *bad);
+char** strv_reverse(char **l);
+char** strv_shell_escape(char **l, const char *bad);
bool strv_fnmatch_full(char* const* patterns, const char *s, int flags, size_t *matched_pos);
static inline bool strv_fnmatch(char* const* patterns, const char *s) {
@@ -222,10 +222,10 @@ static inline bool strv_fnmatch_or_empty(char* const* patterns, const char *s, i
strv_fnmatch_full(patterns, s, flags, NULL);
}
-char ***strv_free_free(char ***l);
+char*** strv_free_free(char ***l);
DEFINE_TRIVIAL_CLEANUP_FUNC(char***, strv_free_free);
-char **strv_skip(char **l, size_t n);
+char** strv_skip(char **l, size_t n);
int strv_extend_n(char ***l, const char *value, size_t n);
--
2.33.0
Reference in New Issue View Git Blame Copy Permalink