diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2018-03-07 11:35:35 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-07 11:35:35 +0100 |
| commit | 6f10433df709511939469276a89a656c802c3150 (patch) | |
| tree | 5e1b13a3f363f20f1631745946788ae5f29e0188 | |
| parent | Merge pull request #8086 from hdante/sdboot-setmode-v2 (diff) | |
| parent | tests: close a leftover file descriptor in `test-fileio` (diff) | |
| download | systemd-6f10433df709511939469276a89a656c802c3150.tar.xz systemd-6f10433df709511939469276a89a656c802c3150.zip | |
Merge pull request #8378 from evverx/get-around-freopen
tests: stop using `freopen` in `test-fileio`
| -rw-r--r-- | src/test/test-fileio.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/test/test-fileio.c b/src/test/test-fileio.c index 286867d2dc..c6128c9091 100644 --- a/src/test/test-fileio.c +++ b/src/test/test-fileio.c @@ -406,7 +406,7 @@ static void test_capeff(void) { static void test_write_string_stream(void) { char fn[] = "/tmp/test-write_string_stream-XXXXXX"; - _cleanup_fclose_ FILE *f = NULL; + FILE *f = NULL; int fd; char buf[64]; @@ -416,8 +416,9 @@ static void test_write_string_stream(void) { f = fdopen(fd, "r"); assert_se(f); assert_se(write_string_stream(f, "boohoo", 0) < 0); + f = safe_fclose(f); - f = freopen(fn, "r+", f); + f = fopen(fn, "r+"); assert_se(f); assert_se(write_string_stream(f, "boohoo", 0) == 0); @@ -425,8 +426,9 @@ static void test_write_string_stream(void) { assert_se(fgets(buf, sizeof(buf), f)); assert_se(streq(buf, "boohoo\n")); + f = safe_fclose(f); - f = freopen(fn, "w+", f); + f = fopen(fn, "w+"); assert_se(f); assert_se(write_string_stream(f, "boohoo", WRITE_STRING_FILE_AVOID_NEWLINE) == 0); @@ -435,6 +437,7 @@ static void test_write_string_stream(void) { assert_se(fgets(buf, sizeof(buf), f)); printf(">%s<", buf); assert_se(streq(buf, "boohoo")); + f = safe_fclose(f); unlink(fn); } @@ -607,7 +610,8 @@ static void test_writing_tmpfile(void) { char name[] = "/tmp/test-systemd_writing_tmpfile.XXXXXX"; _cleanup_free_ char *contents = NULL; size_t size; - int fd, r; + int r; + _cleanup_close_ int fd = -1; struct iovec iov[3]; iov[0] = IOVEC_MAKE_STRING("abc\n"); |