X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Ftest%2Ftest-install.c;h=5ee52e64cb5ac0a271429d7523c6cc12e96c9b3a;hb=b6e676ce41508e2aeea22202fc8f234126177f52;hp=2087d5299436dafb9d698df853c7e859aa6d0755;hpb=2b6bf07dd23bb467099d213c97b3875c5e453491;p=elogind.git diff --git a/src/test/test-install.c b/src/test/test-install.c index 2087d5299..5ee52e64c 100644 --- a/src/test/test-install.c +++ b/src/test/test-install.c @@ -19,19 +19,15 @@ along with systemd; If not, see . ***/ -#include #include #include -#include -#include "util.h" -#include "path-util.h" #include "install.h" static void dump_changes(UnitFileChange *c, unsigned n) { unsigned i; - assert(n == 0 || c); + assert_se(n == 0 || c); for (i = 0; i < n; i++) { if (c[i].type == UNIT_FILE_UNLINK) @@ -51,7 +47,7 @@ int main(int argc, char* argv[]) { UnitFileChange *changes = NULL; unsigned n_changes = 0; - h = hashmap_new(string_hash_func, string_compare_func); + h = hashmap_new(&string_hash_ops); r = unit_file_get_list(UNIT_FILE_SYSTEM, NULL, h); assert_se(r == 0); @@ -253,7 +249,7 @@ int main(int argc, char* argv[]) { changes = NULL; n_changes = 0; - r = unit_file_preset(UNIT_FILE_SYSTEM, false, NULL, (char**) files, false, &changes, &n_changes); + r = unit_file_preset(UNIT_FILE_SYSTEM, false, NULL, (char**) files, UNIT_FILE_PRESET_FULL, false, &changes, &n_changes); assert_se(r >= 0); dump_changes(changes, n_changes);