diff options
| author | Lennart Poettering <lennart@poettering.net> | 2013-09-17 10:03:46 -0500 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2013-09-17 10:06:50 -0500 |
| commit | 19f6d710772305610b928bc2678b9d77fe11e770 (patch) | |
| tree | ca3e7b4f7f20f94137fcef96b92a7a208c72e1c5 /src/test/test-unit-file.c | |
| parent | 0aafd43d235982510d1c40564079f7bcec0c7c19 (diff) | |
specifier: rework specifier calls to return proper error message
Previously the specifier calls could only indicate OOM by returning
NULL. With this change they will return negative errno-style error codes
like everything else.
Diffstat (limited to 'src/test/test-unit-file.c')
| -rw-r--r-- | src/test/test-unit-file.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/test/test-unit-file.c b/src/test/test-unit-file.c index dc6bc55244..0413ae2117 100644 --- a/src/test/test-unit-file.c +++ b/src/test/test-unit-file.c @@ -302,17 +302,18 @@ static void test_install_printf(void) { _cleanup_free_ char *mid, *bid, *host; - assert_se((mid = specifier_machine_id('m', NULL, NULL))); - assert_se((bid = specifier_boot_id('b', NULL, NULL))); + assert_se(specifier_machine_id('m', NULL, NULL, &mid) >= 0 && mid); + assert_se(specifier_boot_id('b', NULL, NULL, &bid) >= 0 && bid); assert_se((host = gethostname_malloc())); #define expect(src, pattern, result) \ do { \ - _cleanup_free_ char *t = install_full_printf(&src, pattern); \ + _cleanup_free_ char *t = NULL; \ _cleanup_free_ char \ *d1 = strdup(i.name), \ *d2 = strdup(i.path), \ *d3 = strdup(i.user); \ + assert_se(install_full_printf(&src, pattern, &t) >= 0 || !result); \ memzero(i.name, strlen(i.name)); \ memzero(i.path, strlen(i.path)); \ memzero(i.user, strlen(i.user)); \ |