diff options
author | Ryszard Knop <ryszard.knop@intel.com> | 2022-06-15 15:49:12 +0200 |
---|---|---|
committer | Ryszard Knop <ryszard.knop@intel.com> | 2022-08-31 13:05:12 +0200 |
commit | 1096ca21fa7ab6db8d1efcde2c4c260718237151 (patch) | |
tree | 8f24ad9c9e765c82d655226cc4752ae029a1b59d /runner | |
parent | 9338ab3ec085292817ab1e74d1f2fb90b6a98332 (diff) |
runner: rename free_settings to clear_settings
That function does not actually free the settings pointer - rename it
for clarity.
Diffstat (limited to 'runner')
-rw-r--r-- | runner/executor.c | 2 | ||||
-rw-r--r-- | runner/resultgen.c | 2 | ||||
-rw-r--r-- | runner/runner_tests.c | 12 | ||||
-rw-r--r-- | runner/settings.c | 8 | ||||
-rw-r--r-- | runner/settings.h | 6 |
5 files changed, 15 insertions, 15 deletions
diff --git a/runner/executor.c b/runner/executor.c index 6e6ca9cc1..9b89cc095 100644 --- a/runner/executor.c +++ b/runner/executor.c @@ -1547,7 +1547,7 @@ bool initialize_execute_state_from_resume(int dirfd, struct job_list_entry *entry; int resdirfd, fd, i; - free_settings(settings); + clear_settings(settings); free_job_list(list); memset(state, 0, sizeof(*state)); state->resuming = true; diff --git a/runner/resultgen.c b/runner/resultgen.c index 479d6d4fd..79725ca26 100644 --- a/runner/resultgen.c +++ b/runner/resultgen.c @@ -1701,7 +1701,7 @@ struct json_object *generate_results_json(int dirfd) close(fd); } - free_settings(&settings); + clear_settings(&settings); free_job_list(&job_list); return obj; diff --git a/runner/runner_tests.c b/runner/runner_tests.c index 8fe869781..aca031fc0 100644 --- a/runner/runner_tests.c +++ b/runner/runner_tests.c @@ -139,7 +139,7 @@ static void job_list_filter_test(const char *name, const char *filterarg1, const } igt_fixture { - free_settings(settings); + clear_settings(settings); free(settings); } } @@ -953,7 +953,7 @@ igt_main close(fd); close(dirfd); clear_directory(dirname); - free_settings(cmp_settings); + clear_settings(cmp_settings); free(cmp_settings); } } @@ -1176,7 +1176,7 @@ igt_main igt_assert(write(fd, journaltext, strlen(journaltext)) == strlen(journaltext)); free_job_list(list); - free_settings(settings); + clear_settings(settings); igt_assert(initialize_execute_state_from_resume(dirfd, &state, settings, list)); igt_assert_eq(state.next, 0); @@ -1233,7 +1233,7 @@ igt_main igt_assert(write(fd, journaltext, strlen(journaltext)) == strlen(journaltext)); free_job_list(list); - free_settings(settings); + clear_settings(settings); igt_assert(initialize_execute_state_from_resume(dirfd, &state, settings, list)); /* All subtests are in journal, the entry should be considered completed */ @@ -1294,7 +1294,7 @@ igt_main igt_assert_eq(write(fd, journaltext, sizeof(journaltext)), sizeof(journaltext)); free_job_list(list); - free_settings(settings); + clear_settings(settings); igt_assert(initialize_execute_state_from_resume(dirfd, &state, settings, list)); igt_assert_eq(state.next, 1); @@ -1942,7 +1942,7 @@ igt_main } igt_fixture { - free_settings(settings); + clear_settings(settings); free(settings); } } diff --git a/runner/settings.c b/runner/settings.c index bb63a9f4a..06947c917 100644 --- a/runner/settings.c +++ b/runner/settings.c @@ -486,7 +486,7 @@ void init_settings(struct settings *settings) memset(settings, 0, sizeof(*settings)); } -void free_settings(struct settings *settings) +void clear_settings(struct settings *settings) { free(settings->test_list); free(settings->name); @@ -536,7 +536,7 @@ bool parse_options(int argc, char **argv, { 0, 0, 0, 0}, }; - free_settings(settings); + clear_settings(settings); optind = 1; @@ -705,7 +705,7 @@ bool parse_options(int argc, char **argv, return true; error: - free_settings(settings); + clear_settings(settings); return false; } @@ -939,7 +939,7 @@ bool read_settings_from_dir(struct settings *settings, int dirfd) int fd; FILE *f; - free_settings(settings); + clear_settings(settings); if ((fd = openat(dirfd, settings_filename, O_RDONLY)) < 0) return false; diff --git a/runner/settings.h b/runner/settings.h index 6ae646952..6d444d012 100644 --- a/runner/settings.h +++ b/runner/settings.h @@ -76,14 +76,14 @@ struct settings { void init_settings(struct settings *settings); /** - * free_settings: + * clear_settings: * * Releases all allocated resources for a settings object and * initializes it to an empty state (see #init_settings). * - * @settings: Object to release and initialize. + * @settings: Object to release and reinitialize. */ -void free_settings(struct settings *settings); +void clear_settings(struct settings *settings); /** * parse_options: |