shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-02-04 17:47:03 +03:00
Code

strv: introduce strv_compare()

Browse Source
This commit is contained in:
Yu Watanabe 2020-01-14 18:29:50 +09:00
parent dbca733213
commit 8b75798d12
3 changed files with 35 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/basic/strv.c
View File

@ -730,19 +730,26 @@ char **strv_sort(char **l) {
return l;
}
bool strv_equal(char * const *a, char * const *b) {
int strv_compare(char * const *a, char * const *b) {
int r;
if (strv_isempty(a))
return strv_isempty(b);
if (strv_isempty(a)) {
if (strv_isempty(b))
return 0;
else
return -1;
}
if (strv_isempty(b))
return false;
return 1;
for ( ; *a || *b; ++a, ++b)
if (!streq_ptr(*a, *b))
return false;
for ( ; *a || *b; ++a, ++b) {
r = strcmp_ptr(*a, *b);
if (r != 0)
return r;
}
return true;
return 0;
}
void strv_print(char * const *l) {

5
src/basic/strv.h
View File

@ -51,7 +51,10 @@ char **strv_remove(char **l, const char *s);
char **strv_uniq(char **l);
bool strv_is_uniq(char * const *l);
bool strv_equal(char * const *a, char * const *b);
int strv_compare(char * const *a, char * const *b);
static inline bool strv_equal(char * const *a, char * const *b) {
return strv_compare(a, b) == 0;
}
#define strv_contains(l, s) (!!strv_find((l), (s)))

26
src/test/test-strv.c
View File

@ -711,27 +711,33 @@ static void test_strv_push(void) {
assert_se(streq_ptr(a[3], NULL));
}
static void test_strv_equal(void) {
static void test_strv_compare(void) {
_cleanup_strv_free_ char **a = NULL;
_cleanup_strv_free_ char **b = NULL;
_cleanup_strv_free_ char **c = NULL;
_cleanup_strv_free_ char **d = NULL;
log_info("/* %s */", __func__);
a = strv_new("one", "two", "three");
assert_se(a);
b = strv_new("one", "two", "three");
assert_se(a);
assert_se(b);
c = strv_new("one", "two", "three", "four");
assert_se(a);
assert_se(c);
d = strv_new(NULL);
assert_se(d);
assert_se(strv_equal(a, a));
assert_se(strv_equal(a, b));
assert_se(strv_equal(NULL, NULL));
assert_se(strv_compare(a, a) == 0);
assert_se(strv_compare(a, b) == 0);
assert_se(strv_compare(d, d) == 0);
assert_se(strv_compare(d, NULL) == 0);
assert_se(strv_compare(NULL, NULL) == 0);
assert_se(!strv_equal(a, c));
assert_se(!strv_equal(b, c));
assert_se(!strv_equal(b, NULL));
assert_se(strv_compare(a, c) < 0);
assert_se(strv_compare(b, c) < 0);
assert_se(strv_compare(b, d) == 1);
assert_se(strv_compare(b, NULL) == 1);
}
static void test_strv_is_uniq(void) {
@ -988,7 +994,7 @@ int main(int argc, char *argv[]) {
test_strv_insert();
test_strv_push_prepend();
test_strv_push();
test_strv_equal();
test_strv_compare();
test_strv_is_uniq();
test_strv_reverse();
test_strv_shell_escape();