shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-25 01:34:28 +03:00
Code

path: modernize, return first error

Browse Source
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2023-09-14 12:42:50 +02:00
parent eb98074b5c
commit 1535b52f1a
1 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/path/path.c
View File

@ -102,10 +102,9 @@ static const char* const path_table[_SD_PATH_MAX] = {
}; };
static int list_homes(void) { static int list_homes(void) {
uint64_t i = 0;
int r = 0; int r = 0;
for (i = 0; i < ELEMENTSOF(path_table); i++) { for (size_t i = 0; i < ELEMENTSOF(path_table); i++) {
_cleanup_free_ char *p = NULL; _cleanup_free_ char *p = NULL;
int q; int q;
@ -114,7 +113,7 @@ static int list_homes(void) {
log_full_errno(q == -ENXIO ? LOG_DEBUG : LOG_ERR, log_full_errno(q == -ENXIO ? LOG_DEBUG : LOG_ERR,
q, "Failed to query %s: %m", path_table[i]); q, "Failed to query %s: %m", path_table[i]);
if (q != -ENXIO) if (q != -ENXIO)
r = q; RET_GATHER(r, q);
continue; continue;
} }
@ -125,10 +124,9 @@ static int list_homes(void) {
} }
static int print_home(const char *n) { static int print_home(const char *n) {
uint64_t i = 0;
int r; int r;
for (i = 0; i < ELEMENTSOF(path_table); i++) { for (size_t i = 0; i < ELEMENTSOF(path_table); i++)
if (streq(path_table[i], n)) { if (streq(path_table[i], n)) {
_cleanup_free_ char *p = NULL; _cleanup_free_ char *p = NULL;
@ -139,7 +137,6 @@ static int print_home(const char *n) {
printf("%s\n", p); printf("%s\n", p);
return 0; return 0;
} }
}
return log_error_errno(SYNTHETIC_ERRNO(EOPNOTSUPP), return log_error_errno(SYNTHETIC_ERRNO(EOPNOTSUPP),
"Path %s not known.", n); "Path %s not known.", n);
@ -218,18 +215,13 @@ static int run(int argc, char* argv[]) {
if (r <= 0) if (r <= 0)
return r; return r;
if (argc > optind) { if (argc > optind)
int i, q; for (int i = optind; i < argc; i++)
RET_GATHER(r, print_home(argv[i]));
else
r = list_homes();
for (i = optind; i < argc; i++) { return r;
q = print_home(argv[i]);
if (q < 0)
r = q;
}
return r;
} else
return list_homes();
} }
DEFINE_MAIN_FUNCTION(run); DEFINE_MAIN_FUNCTION(run);