diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2018-04-23 10:24:39 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-23 10:24:39 +0900 |
| commit | 80f00482037501782e4d64a7a2f6cb920670b658 (patch) | |
| tree | b1a0fb3f2d2e1cf60c88e0f13f8d7bcf91839ec0 /src | |
| parent | d6b87637c52148f5861aca557de2711dcd0c2efd (diff) | |
| parent | 60e9682a800b93886da362162e949cdc8c064c21 (diff) | |
| download | systemd-80f00482037501782e4d64a7a2f6cb920670b658.tar.gz | |
Merge pull request #8769 from keszybz/followups
Three trivial followups for recent patches
Diffstat (limited to 'src')
| -rw-r--r-- | src/basic/terminal-util.c | 4 | ||||
| -rw-r--r-- | src/sysusers/sysusers.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/basic/terminal-util.c b/src/basic/terminal-util.c index 3166145b33..2bf0f4f86d 100644 --- a/src/basic/terminal-util.c +++ b/src/basic/terminal-util.c @@ -1322,8 +1322,8 @@ int terminal_urlify_path(const char *path, const char *text, char **ret) { assert(path); - /* Much like terminal_urlify() above, but takes a file system path as input, and turns it into a properl - * file:// URL first. */ + /* Much like terminal_urlify() above, but takes a file system path as input + * and turns it into a proper file:// URL first. */ if (isempty(path)) return -EINVAL; diff --git a/src/sysusers/sysusers.c b/src/sysusers/sysusers.c index 6b4acd4e80..7c5fafcf8a 100644 --- a/src/sysusers/sysusers.c +++ b/src/sysusers/sysusers.c @@ -97,8 +97,8 @@ static int load_user_database(void) { return r; while ((r = fgetpwent_sane(f, &pw)) > 0) { - int k, q; char *n; + int k, q; n = strdup(pw->pw_name); if (!n) @@ -117,7 +117,7 @@ static int load_user_database(void) { return q; } - if (q <= 0 && k <= 0) + if (k <= 0 && q <= 0) free(n); } return r; @@ -164,7 +164,7 @@ static int load_group_database(void) { return q; } - if (q <= 0 && k <= 0) + if (k <= 0 && q <= 0) free(n); errno = 0; |