X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Ftest%2Ftest-unit-file.c;h=89f5bdd4ed3e1f6ba54fac748191ed92ae5ebbcf;hb=080edb3484dc3ecf8d914526fdd3090b40fdf5b6;hp=48133428df393960214f1079cefc5242bbd20548;hpb=552c693eea399e8e32ffb8c9302aaffeb520427d;p=elogind.git diff --git a/src/test/test-unit-file.c b/src/test/test-unit-file.c index 48133428d..89f5bdd4e 100644 --- a/src/test/test-unit-file.c +++ b/src/test/test-unit-file.c @@ -44,7 +44,7 @@ static int test_unit_file_get_set(void) { Iterator i; UnitFileList *p; - h = hashmap_new(string_hash_func, string_compare_func); + h = hashmap_new(&string_hash_ops); assert(h); r = unit_file_get_list(UNIT_FILE_SYSTEM, NULL, h); @@ -234,7 +234,7 @@ static void test_load_env_file_1(void) { assert(fd >= 0); assert_se(write(fd, env_file_1, sizeof(env_file_1)) == sizeof(env_file_1)); - r = load_env_file(name, NULL, &data); + r = load_env_file(NULL, name, NULL, &data); assert(r == 0); assert(streq(data[0], "a=a")); assert(streq(data[1], "b=bc")); @@ -257,7 +257,7 @@ static void test_load_env_file_2(void) { assert(fd >= 0); assert_se(write(fd, env_file_2, sizeof(env_file_2)) == sizeof(env_file_2)); - r = load_env_file(name, NULL, &data); + r = load_env_file(NULL, name, NULL, &data); assert(r == 0); assert(streq(data[0], "a=a")); assert(data[1] == NULL); @@ -275,7 +275,7 @@ static void test_load_env_file_3(void) { assert(fd >= 0); assert_se(write(fd, env_file_3, sizeof(env_file_3)) == sizeof(env_file_3)); - r = load_env_file(name, NULL, &data); + r = load_env_file(NULL, name, NULL, &data); assert(r == 0); assert(data == NULL); unlink(name); @@ -291,7 +291,7 @@ static void test_load_env_file_4(void) { assert(fd >= 0); assert_se(write(fd, env_file_4, sizeof(env_file_4)) == sizeof(env_file_4)); - r = load_env_file(name, NULL, &data); + r = load_env_file(NULL, name, NULL, &data); assert(r == 0); assert(streq(data[0], "HWMON_MODULES=coretemp f71882fg")); assert(streq(data[1], "MODULE_0=coretemp"));