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

tree-wide: propagate the error we got from strv_extend_xyz() to the caller

Browse Source 
It's a bit sloppy to return -ENOMEM rather than the actual error we
already returned in the first place (even though it's always going to be
ENOMEM)
This commit is contained in:
Lennart Poettering
2024-01-17 11:32:11 +01:00
parent 4212636763
commit 010cd1dc58
6 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/sysusers/sysusers.c
+8 -6
View File
@@ -347,6 +347,7 @@ static int putgrent_with_members(
FILE *group) {
char **a;
int r;
assert(c);
assert(gr);
@@ -365,15 +366,15 @@ static int putgrent_with_members(
if (strv_contains(l, *i))
continue;
if (strv_extend(&l, *i) < 0)
return -ENOMEM;
r = strv_extend(&l, *i);
if (r < 0)
return r;
added = true;
}
if (added) {
struct group t;
int r;
strv_uniq(l);
strv_sort(l);
@@ -396,6 +397,7 @@ static int putsgent_with_members(
FILE *gshadow) {
char **a;
int r;
assert(sg);
assert(gshadow);
@@ -413,15 +415,15 @@ static int putsgent_with_members(
if (strv_contains(l, *i))
continue;
if (strv_extend(&l, *i) < 0)
return -ENOMEM;
r = strv_extend(&l, *i);
if (r < 0)
return r;
added = true;
}
if (added) {
struct sgrp t;
int r;
strv_uniq(l);
strv_sort(l);