summaryrefslogtreecommitdiff
path: root/src/test
diff options
context:
space:
mode:
Diffstat (limited to 'src/test')
-rw-r--r--src/test/test-unit-file.c22
-rw-r--r--src/test/test-unit-name.c12
2 files changed, 17 insertions, 17 deletions
diff --git a/src/test/test-unit-file.c b/src/test/test-unit-file.c
index 31b0fb2665..a7fe77af24 100644
--- a/src/test/test-unit-file.c
+++ b/src/test/test-unit-file.c
@@ -211,11 +211,11 @@ static void test_config_parse_exec(void) {
static void test_load_env_file_1(void) {
- char _cleanup_strv_free_ **data = NULL;
+ _cleanup_strv_free_ char **data = NULL;
int r;
char name[] = "/tmp/test-load-env-file.XXXXXX";
- int _cleanup_close_ fd = mkstemp(name);
+ _cleanup_close_ int fd = mkstemp(name);
assert(fd >= 0);
assert_se(write(fd, env_file_1, sizeof(env_file_1)) == sizeof(env_file_1));
@@ -232,11 +232,11 @@ static void test_load_env_file_1(void) {
}
static void test_load_env_file_2(void) {
- char _cleanup_strv_free_ **data = NULL;
+ _cleanup_strv_free_ char **data = NULL;
int r;
char name[] = "/tmp/test-load-env-file.XXXXXX";
- int _cleanup_close_ fd = mkstemp(name);
+ _cleanup_close_ int fd = mkstemp(name);
assert(fd >= 0);
assert_se(write(fd, env_file_2, sizeof(env_file_2)) == sizeof(env_file_2));
@@ -248,11 +248,11 @@ static void test_load_env_file_2(void) {
}
static void test_load_env_file_3(void) {
- char _cleanup_strv_free_ **data = NULL;
+ _cleanup_strv_free_ char **data = NULL;
int r;
char name[] = "/tmp/test-load-env-file.XXXXXX";
- int _cleanup_close_ fd = mkstemp(name);
+ _cleanup_close_ int fd = mkstemp(name);
assert(fd >= 0);
assert_se(write(fd, env_file_3, sizeof(env_file_3)) == sizeof(env_file_3));
@@ -263,11 +263,11 @@ static void test_load_env_file_3(void) {
}
static void test_load_env_file_4(void) {
- char _cleanup_strv_free_ **data = NULL;
+ _cleanup_strv_free_ char **data = NULL;
int r;
char name[] = "/tmp/test-load-env-file.XXXXXX";
- int _cleanup_close_ fd = mkstemp(name);
+ _cleanup_close_ int fd = mkstemp(name);
assert(fd >= 0);
assert_se(write(fd, env_file_4, sizeof(env_file_4)) == sizeof(env_file_4));
@@ -295,7 +295,7 @@ static void test_install_printf(void) {
InstallInfo i3 = {name3, path3, user};
InstallInfo i4 = {name3, path3, NULL};
- char _cleanup_free_ *mid, *bid, *host;
+ _cleanup_free_ char *mid, *bid, *host;
assert_se((mid = specifier_machine_id('m', NULL, NULL)));
assert_se((bid = specifier_boot_id('b', NULL, NULL)));
@@ -303,8 +303,8 @@ static void test_install_printf(void) {
#define expect(src, pattern, result) \
do { \
- char _cleanup_free_ *t = install_full_printf(&src, pattern); \
- char _cleanup_free_ \
+ _cleanup_free_ char *t = install_full_printf(&src, pattern); \
+ _cleanup_free_ char \
*d1 = strdup(i.name), \
*d2 = strdup(i.path), \
*d3 = strdup(i.user); \
diff --git a/src/test/test-unit-name.c b/src/test/test-unit-name.c
index aba36e4df1..86cb2b8da6 100644
--- a/src/test/test-unit-name.c
+++ b/src/test/test-unit-name.c
@@ -38,7 +38,7 @@
static void test_replacements(void) {
#define expect(pattern, repl, expected) \
{ \
- char _cleanup_free_ *t = \
+ _cleanup_free_ char *t = \
unit_name_replace_instance(pattern, repl); \
puts(t); \
assert(streq(t, expected)); \
@@ -57,7 +57,7 @@ static void test_replacements(void) {
#undef expect
#define expect(path, suffix, expected) \
{ \
- char _cleanup_free_ *k, *t = \
+ _cleanup_free_ char *k, *t = \
unit_name_from_path(path, suffix); \
puts(t); \
k = unit_name_to_path(t); \
@@ -75,7 +75,7 @@ static void test_replacements(void) {
#undef expect
#define expect(pattern, path, suffix, expected) \
{ \
- char _cleanup_free_ *t = \
+ _cleanup_free_ char *t = \
unit_name_from_path_instance(pattern, path, suffix); \
puts(t); \
assert(streq(t, expected)); \
@@ -90,7 +90,7 @@ static void test_replacements(void) {
#undef expect
#define expect(pattern) \
{ \
- char _cleanup_free_ *k, *t; \
+ _cleanup_free_ char *k, *t; \
assert_se(t = unit_name_mangle(pattern)); \
assert_se(k = unit_name_mangle(t)); \
puts(t); \
@@ -113,7 +113,7 @@ static int test_unit_printf(void) {
Unit *u, *u2;
int r;
- char _cleanup_free_ *mid, *bid, *host, *root_uid;
+ _cleanup_free_ char *mid, *bid, *host, *root_uid;
struct passwd *root;
assert_se((mid = specifier_machine_id('m', NULL, NULL)));
@@ -133,7 +133,7 @@ static int test_unit_printf(void) {
#define expect(unit, pattern, expected) \
{ \
char *e; \
- char _cleanup_free_ *t = \
+ _cleanup_free_ char *t = \
unit_full_printf(unit, pattern); \
printf("result: %s\nexpect: %s\n", t, expected); \
if ((e = endswith(expected, "*"))) \