diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2018-10-23 10:50:09 +0200 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2018-10-26 12:56:51 +0200 |
| commit | d8351049a8547be4a512d29d9b4127ff1920b6cf (patch) | |
| tree | fbd33829549441d8577329ac56f1a7444d2c69f4 /src/test/test-conf-parser.c | |
| parent | 9f1c81d80a435d15ca1bd536a6d043c18c81c047 (diff) | |
| download | systemd-d8351049a8547be4a512d29d9b4127ff1920b6cf.tar.gz | |
Introduce fmkostemp_safe and use it in tests
No functional change.
Diffstat (limited to 'src/test/test-conf-parser.c')
| -rw-r--r-- | src/test/test-conf-parser.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/test/test-conf-parser.c b/src/test/test-conf-parser.c index ff951d12f4..91f1d9a386 100644 --- a/src/test/test-conf-parser.c +++ b/src/test/test-conf-parser.c @@ -311,9 +311,9 @@ static const char* const config_file[] = { static void test_config_parse(unsigned i, const char *s) { _cleanup_(unlink_tempfilep) char name[] = "/tmp/test-conf-parser.XXXXXX"; - int fd, r; _cleanup_fclose_ FILE *f = NULL; _cleanup_free_ char *setting1 = NULL; + int r; const ConfigTableItem items[] = { { "Section", "setting1", config_parse_string, 0, &setting1}, @@ -322,12 +322,9 @@ static void test_config_parse(unsigned i, const char *s) { log_info("== %s[%i] ==", __func__, i); - fd = mkostemp_safe(name); - assert_se(fd >= 0); - assert_se((size_t) write(fd, s, strlen(s)) == strlen(s)); - - assert_se(lseek(fd, 0, SEEK_SET) == 0); - assert_se(f = fdopen(fd, "r")); + assert_se(fmkostemp_safe(name, "r+", &f) == 0); + assert_se(fwrite(s, strlen(s), 1, f) == 1); + rewind(f); /* int config_parse(const char *unit, |