diff options
author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2018-11-20 23:40:44 +0100 |
---|---|---|
committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2018-11-22 10:54:38 +0100 |
commit | baaa35ad706419ae5aacc11d2bece5bd8b73ee42 (patch) | |
tree | bb4b9c576fc56b3237d59e959ded7c245917fcd7 /src/random-seed | |
parent | 52d86690d68779b120a4380f7cc740825827fb0d (diff) | |
download | systemd-baaa35ad706419ae5aacc11d2bece5bd8b73ee42.tar.gz |
coccinelle: make use of SYNTHETIC_ERRNO
Ideally, coccinelle would strip unnecessary braces too. But I do not see any
option in coccinelle for this, so instead, I edited the patch text using
search&replace to remove the braces. Unfortunately this is not fully automatic,
in particular it didn't deal well with if-else-if-else blocks and ifdefs, so
there is an increased likelikehood be some bugs in such spots.
I also removed part of the patch that coccinelle generated for udev, where we
returns -1 for failure. This should be fixed independently.
Diffstat (limited to 'src/random-seed')
-rw-r--r-- | src/random-seed/random-seed.c | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/src/random-seed/random-seed.c b/src/random-seed/random-seed.c index 1d2b017cf7..0c5f329756 100644 --- a/src/random-seed/random-seed.c +++ b/src/random-seed/random-seed.c @@ -32,10 +32,9 @@ static int run(int argc, char *argv[]) { log_setup_service(); - if (argc != 2) { - log_error("This program requires one argument."); - return -EINVAL; - } + if (argc != 2) + return log_error_errno(SYNTHETIC_ERRNO(EINVAL), + "This program requires one argument."); umask(0022); @@ -104,10 +103,9 @@ static int run(int argc, char *argv[]) { read_seed_file = false; write_seed_file = true; - } else { - log_error("Unknown verb '%s'.", argv[1]); - return -EINVAL; - } + } else + return log_error_errno(SYNTHETIC_ERRNO(EINVAL), + "Unknown verb '%s'.", argv[1]); if (fstat(seed_fd, &st) < 0) return log_error_errno(errno, "Failed to stat() seed file " RANDOM_SEED ": %m"); @@ -164,10 +162,9 @@ static int run(int argc, char *argv[]) { k = loop_read(random_fd, buf, buf_size, false); if (k < 0) return log_error_errno(k, "Failed to read new seed from /dev/urandom: %m"); - if (k == 0) { - log_error("Got EOF while reading from /dev/urandom."); - return -EIO; - } + if (k == 0) + return log_error_errno(SYNTHETIC_ERRNO(EIO), + "Got EOF while reading from /dev/urandom."); r = loop_write(seed_fd, buf, (size_t) k, false); if (r < 0) |