diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2022-09-17 01:57:04 +0900 |
|---|---|---|
| committer | Daan De Meyer <daan.j.demeyer@gmail.com> | 2022-09-17 09:54:41 +0200 |
| commit | ee3455cf11acbfccc3df201f1feea674fc91f77d (patch) | |
| tree | c288d42f0bdfad3d6a73815e4223538363b6ec13 /src/import | |
| parent | cb19517490104553907bb0b118cd2005d6e379cc (diff) | |
| download | systemd-ee3455cf11acbfccc3df201f1feea674fc91f77d.tar.gz | |
fd-util: rename CLOSE_AND_REPLACE() -> close_and_replace()
We have free_and_replace() and friends, they are all named with lower
letters, even they are macros, not functions.
For consistency, let's rename CLOSE_AND_REPLACE() with lower letters.
This also mekes the macro used more places.
Diffstat (limited to 'src/import')
| -rw-r--r-- | src/import/import-raw.c | 2 | ||||
| -rw-r--r-- | src/import/pull-raw.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/import/import-raw.c b/src/import/import-raw.c index 0faa58acf5..30f5b9050b 100644 --- a/src/import/import-raw.c +++ b/src/import/import-raw.c @@ -195,7 +195,7 @@ static int raw_import_maybe_convert_qcow2(RawImport *i) { unlink_and_free(i->temp_path); i->temp_path = TAKE_PTR(t); - CLOSE_AND_REPLACE(i->output_fd, converted_fd); + close_and_replace(i->output_fd, converted_fd); return 1; } diff --git a/src/import/pull-raw.c b/src/import/pull-raw.c index 0623afcc84..f4f869d38e 100644 --- a/src/import/pull-raw.c +++ b/src/import/pull-raw.c @@ -280,7 +280,7 @@ static int raw_pull_maybe_convert_qcow2(RawPull *i) { unlink_and_free(i->temp_path); i->temp_path = TAKE_PTR(t); - CLOSE_AND_REPLACE(i->raw_job->disk_fd, converted_fd); + close_and_replace(i->raw_job->disk_fd, converted_fd); return 1; } |