X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fimport%2Fimport-common.c;h=2acf380f99bb6898f1489fdf2ec1b70659b062ed;hb=63c372cb9df3bee01e3bf8cd7f96f336bddda846;hp=e5531b89c5dd6901aba558a1193f97a18930506c;hpb=e026c242af5b724da53e4944aab2645547644cf7;p=elogind.git diff --git a/src/import/import-common.c b/src/import/import-common.c index e5531b89c..2acf380f9 100644 --- a/src/import/import-common.c +++ b/src/import/import-common.c @@ -121,7 +121,7 @@ int import_make_local_copy(const char *final, const char *image_root, const char if (!image_root) image_root = "/var/lib/machines"; - p = strappenda(image_root, "/", local); + p = strjoina(image_root, "/", local); if (force_local) { (void) btrfs_subvol_remove(p); @@ -309,7 +309,7 @@ int import_verify( return -EBADMSG; } - line = strappenda(main_job->checksum, " *", fn, "\n"); + line = strjoina(main_job->checksum, " *", fn, "\n"); p = memmem(checksum_job->payload, checksum_job->payload_size,