SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace strdup_or_null() by strdup_to()

Browse Source 
I didn't know that this helper existed… It is very similar to strdup_to_full(),
but all callers can actually be replaced by strdup_to(), which has more fitting
semantics.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2024-03-20 15:18:21 +01:00
parent f174b294f6
commit 6a705f1234
7 changed files with 17 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kernel-install/kernel-install.c
+10 -10
View File
@@ -151,37 +151,37 @@ static int context_copy(const Context *source, Context *ret) {
return copy.rfd;
}
r = strdup_or_null(source->layout_other, &copy.layout_other);
r = strdup_to(&copy.layout_other, source->layout_other);
if (r < 0)
return r;
r = strdup_or_null(source->conf_root, &copy.conf_root);
r = strdup_to(&copy.conf_root, source->conf_root);
if (r < 0)
return r;
r = strdup_or_null(source->boot_root, &copy.boot_root);
r = strdup_to(&copy.boot_root, source->boot_root);
if (r < 0)
return r;
r = strdup_or_null(source->entry_token, &copy.entry_token);
r = strdup_to(&copy.entry_token, source->entry_token);
if (r < 0)
return r;
r = strdup_or_null(source->entry_dir, &copy.entry_dir);
r = strdup_to(&copy.entry_dir, source->entry_dir);
if (r < 0)
return r;
r = strdup_or_null(source->version, &copy.version);
r = strdup_to(&copy.version, source->version);
if (r < 0)
return r;
r = strdup_or_null(source->kernel, &copy.kernel);
r = strdup_to(&copy.kernel, source->kernel);
if (r < 0)
return r;
r = strv_copy_unless_empty(source->initrds, &copy.initrds);
if (r < 0)
return r;
r = strdup_or_null(source->initrd_generator, &copy.initrd_generator);
r = strdup_to(&copy.initrd_generator, source->initrd_generator);
if (r < 0)
return r;
r = strdup_or_null(source->uki_generator, &copy.uki_generator);
r = strdup_to(&copy.uki_generator, source->uki_generator);
if (r < 0)
return r;
r = strdup_or_null(source->staging_area, &copy.staging_area);
r = strdup_to(&copy.staging_area, source->staging_area);
if (r < 0)
return r;
r = strv_copy_unless_empty(source->plugins, &copy.plugins);