diff options
| author | Daniel Mack <github@zonque.org> | 2015-09-10 19:01:25 +0200 |
|---|---|---|
| committer | Daniel Mack <github@zonque.org> | 2015-09-10 19:01:25 +0200 |
| commit | 786c5bf957f8f7b78c7a0999908ff822e712b53e (patch) | |
| tree | d330ac099c5d75669ab5d8d21e880bc29521add8 /src/test | |
| parent | 15af581253a3f25a71d4fa723bf1fdd22f842728 (diff) | |
| parent | e11d45682ed0ccdbdfe71a958718c836114a4610 (diff) | |
Merge pull request #1242 from poettering/no-off_t
Drop usage of off_t
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/test-copy.c | 2 | ||||
| -rw-r--r-- | src/test/test-util.c | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/test/test-copy.c b/src/test/test-copy.c index b73c958ec5..a03a68bd43 100644 --- a/src/test/test-copy.c +++ b/src/test/test-copy.c @@ -146,7 +146,7 @@ static void test_copy_bytes(void) { assert_se(pipe2(pipefd, O_CLOEXEC) == 0); - r = copy_bytes(infd, pipefd[1], (off_t) -1, false); + r = copy_bytes(infd, pipefd[1], (uint64_t) -1, false); assert_se(r == 0); r = read(pipefd[0], buf, sizeof(buf)); diff --git a/src/test/test-util.c b/src/test/test-util.c index 8ceb71f22a..7935442dbb 100644 --- a/src/test/test-util.c +++ b/src/test/test-util.c @@ -893,7 +893,7 @@ static void test_protect_errno(void) { } static void test_parse_size(void) { - off_t bytes; + uint64_t bytes; assert_se(parse_size("111", 1024, &bytes) == 0); assert_se(bytes == 111); @@ -960,12 +960,12 @@ static void test_parse_size(void) { assert_se(parse_size("-10B 20K", 1024, &bytes) == -ERANGE); } -static void test_config_parse_iec_off(void) { - off_t offset = 0; - assert_se(config_parse_iec_off(NULL, "/this/file", 11, "Section", 22, "Size", 0, "4M", &offset, NULL) == 0); +static void test_config_parse_iec_uint64(void) { + uint64_t offset = 0; + assert_se(config_parse_iec_uint64(NULL, "/this/file", 11, "Section", 22, "Size", 0, "4M", &offset, NULL) == 0); assert_se(offset == 4 * 1024 * 1024); - assert_se(config_parse_iec_off(NULL, "/this/file", 11, "Section", 22, "Size", 0, "4.5M", &offset, NULL) == 0); + assert_se(config_parse_iec_uint64(NULL, "/this/file", 11, "Section", 22, "Size", 0, "4.5M", &offset, NULL) == 0); } static void test_strextend(void) { @@ -2250,7 +2250,7 @@ int main(int argc, char *argv[]) { test_u64log2(); test_protect_errno(); test_parse_size(); - test_config_parse_iec_off(); + test_config_parse_iec_uint64(); test_strextend(); test_strrep(); test_split_pair(); |