shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-01-26 14:04:03 +03:00
Code

tree-wide: port various places to find_line_startswith()

Browse Source
This commit is contained in:
Lennart Poettering 2023-03-24 18:25:13 +01:00
parent 7b82d95f8d
commit 50ed5cbf5f
4 changed files with 12 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/basic/mountpoint-util.c
View File

@ -125,14 +125,9 @@ static int fd_fdinfo_mnt_id(int fd, const char *filename, int flags, int *ret_mn
if (r < 0)
return r;
p = startswith(fdinfo, "mnt_id:");
if (!p) {
p = strstr(fdinfo, "\nmnt_id:");
if (!p) /* The mnt_id field is a relatively new addition */
return -EOPNOTSUPP;
p += 8;
}
p = find_line_startswith(fdinfo, "mnt_id:");
if (!p) /* The mnt_id field is a relatively new addition */
return -EOPNOTSUPP;
p += strspn(p, WHITESPACE);
p[strcspn(p, WHITESPACE)] = 0;

11
src/basic/process-util.c
View File

@ -1453,14 +1453,9 @@ int pidfd_get_pid(int fd, pid_t *ret) {
if (r < 0)
return r;
p = startswith(fdinfo, "Pid:");
if (!p) {
p = strstr(fdinfo, "\nPid:");
if (!p)
return -ENOTTY; /* not a pidfd? */
p += 5;
}
p = find_line_startswith(fdinfo, "Pid:");
if (!p)
return -ENOTTY; /* not a pidfd? */
p += strspn(p, WHITESPACE);
p[strcspn(p, WHITESPACE)] = 0;

11
src/import/importd.c
View File

@ -590,14 +590,9 @@ static int manager_on_notify(sd_event_source *s, int fd, uint32_t revents, void
buf[n] = 0;
p = startswith(buf, "X_IMPORT_PROGRESS=");
if (!p) {
p = strstr(buf, "\nX_IMPORT_PROGRESS=");
if (!p)
return 0;
p += 19;
}
p = find_line_startswith(buf, "X_IMPORT_PROGRESS=");
if (!p)
return 0;
e = strchrnul(p, '\n');
*e = 0;

11
src/shared/logs-show.c
View File

@ -93,14 +93,9 @@ static int url_from_catalog(sd_journal *j, char **ret) {
if (r < 0)
return log_error_errno(r, "Failed to find catalog entry: %m");
weblink = startswith(t, "Documentation:");
if (!weblink) {
weblink = strstr(t + 1, "\nDocumentation:");
if (!weblink)
goto notfound;
weblink += 15;
}
weblink = find_line_startswith(t, "Documentation:");
if (!weblink)
goto notfound;
/* Skip whitespace to value */
weblink += strspn(weblink, " \t");