diff options
| author | Lennart Poettering <lennart@poettering.net> | 2018-04-17 19:34:27 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-17 19:34:27 +0200 |
| commit | 2341b24344b0c871740ad288e9b05d643609053e (patch) | |
| tree | eb3187c5fae874a93a8222dff31a5e8b11b3184b | |
| parent | 223932c786ada7f758a7b7878a6ad2dae0d1e5fb (diff) | |
| parent | 4436e5a703006dc9b86e37d7f3d4b614cd61ff92 (diff) | |
| download | systemd-2341b24344b0c871740ad288e9b05d643609053e.tar.gz | |
Merge pull request #8716 from keszybz/two-nitpicks
Two nitpicks
| -rw-r--r-- | src/basic/copy.c | 2 | ||||
| -rw-r--r-- | src/basic/unit-name.c | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/src/basic/copy.c b/src/basic/copy.c index 55394871fd..5b6cae39d0 100644 --- a/src/basic/copy.c +++ b/src/basic/copy.c @@ -69,7 +69,7 @@ static int fd_is_nonblock_pipe(int fd) { struct stat st; int flags; - /* Checks whether the specified file descriptor refers to a pipe, and if so if is has O_NONBLOCK set. */ + /* Checks whether the specified file descriptor refers to a pipe, and if so if O_NONBLOCK is set. */ if (fstat(fd, &st) < 0) return -errno; diff --git a/src/basic/unit-name.c b/src/basic/unit-name.c index 6fb9cbc361..13653d9b78 100644 --- a/src/basic/unit-name.c +++ b/src/basic/unit-name.c @@ -247,8 +247,6 @@ int unit_name_build(const char *prefix, const char *instance, const char *suffix assert(suffix); assert(ret); - if (isempty(suffix)) - return -EINVAL; if (suffix[0] != '.') return -EINVAL; |