summaryrefslogtreecommitdiff
path: root/src/test
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2019-07-11 07:54:04 +0200
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2019-07-12 00:17:45 +0200
commit2aa07538bad3efb54309ada63fdaa1273ffbd1a2 (patch)
treeca75bd5f58aad388acc053941f54fa3f681ee2eb /src/test
parent67da2cc883fb261d2f9e5819df5646b2165196a8 (diff)
downloadsystemd-2aa07538bad3efb54309ada63fdaa1273ffbd1a2.tar.gz
systemd-2aa07538bad3efb54309ada63fdaa1273ffbd1a2.tar.bz2
systemd-2aa07538bad3efb54309ada63fdaa1273ffbd1a2.zip
test: minor modernization
Coverity was complaining that read() does not terminate the data. But we did that termination earlier, so covirity is wrong (CID#1402306, CID#1402340). Let's modernize the style a bit nevertheless. (size_t) cast is needed to avoid the warning about comparison, iff the value is not a constant.
Diffstat (limited to 'src/test')
-rw-r--r--src/test/test-copy.c6
-rw-r--r--src/test/test-fileio.c4
2 files changed, 5 insertions, 5 deletions
diff --git a/src/test/test-copy.c b/src/test/test-copy.c
index 5f4bc39580..731d599ae7 100644
--- a/src/test/test-copy.c
+++ b/src/test/test-copy.c
@@ -52,8 +52,8 @@ static void test_copy_file_fd(void) {
char in_fn[] = "/tmp/test-copy-file-fd-XXXXXX";
char out_fn[] = "/tmp/test-copy-file-fd-XXXXXX";
_cleanup_close_ int in_fd = -1, out_fd = -1;
- char text[] = "boohoo\nfoo\n\tbar\n";
- char buf[64] = {0};
+ const char *text = "boohoo\nfoo\n\tbar\n";
+ char buf[64] = {};
log_info("%s", __func__);
@@ -67,7 +67,7 @@ static void test_copy_file_fd(void) {
assert_se(copy_file_fd(in_fn, out_fd, COPY_REFLINK) >= 0);
assert_se(lseek(out_fd, SEEK_SET, 0) == 0);
- assert_se(read(out_fd, buf, sizeof(buf)) == sizeof(text) - 1);
+ assert_se(read(out_fd, buf, sizeof buf) == (ssize_t) strlen(text));
assert_se(streq(buf, text));
unlink(in_fn);
diff --git a/src/test/test-fileio.c b/src/test/test-fileio.c
index 211def88eb..1ad47a4aa3 100644
--- a/src/test/test-fileio.c
+++ b/src/test/test-fileio.c
@@ -427,7 +427,7 @@ static void test_write_string_file(void) {
static void test_write_string_file_no_create(void) {
_cleanup_(unlink_tempfilep) char fn[] = "/tmp/test-write_string_file_no_create-XXXXXX";
_cleanup_close_ int fd;
- char buf[64] = {0};
+ char buf[64] = {};
fd = mkostemp_safe(fn);
assert_se(fd >= 0);
@@ -435,7 +435,7 @@ static void test_write_string_file_no_create(void) {
assert_se(write_string_file("/a/file/which/does/not/exists/i/guess", "boohoo", 0) < 0);
assert_se(write_string_file(fn, "boohoo", 0) == 0);
- assert_se(read(fd, buf, sizeof(buf)) == STRLEN("boohoo\n"));
+ assert_se(read(fd, buf, sizeof buf) == (ssize_t) strlen("boohoo\n"));
assert_se(streq(buf, "boohoo\n"));
}