From fc7ad9f9947b5097e1a246b009b487d3206fd588 Mon Sep 17 00:00:00 2001 From: midipix Date: Wed, 21 Feb 2024 06:18:44 +0000 Subject: slbt_util_copy_file(): simplify interface. --- src/logic/slbt_exec_install.c | 11 ++++++----- src/logic/slbt_exec_link.c | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) (limited to 'src/logic') diff --git a/src/logic/slbt_exec_install.c b/src/logic/slbt_exec_install.c index 20cf679..ddd3a60 100644 --- a/src/logic/slbt_exec_install.c +++ b/src/logic/slbt_exec_install.c @@ -191,7 +191,7 @@ static int slbt_exec_install_import_libraries( dctx->cctx->asettings.impsuffix); /* copy: .libs/libfoo.x.y.z.lib.a --> dstdir */ - if (slbt_util_copy_file(dctx,ectx,srcbuf,dstdir)) + if (slbt_util_copy_file(ectx,srcbuf,dstdir)) return SLBT_NESTED_ERROR(dctx); /* .libs/libfoo.x.lib.a */ @@ -200,7 +200,7 @@ static int slbt_exec_install_import_libraries( dctx->cctx->asettings.impsuffix); /* copy: .libs/libfoo.x.lib.a --> dstdir */ - if (slbt_util_copy_file(dctx,ectx,srcbuf,dstdir)) + if (slbt_util_copy_file(ectx,srcbuf,dstdir)) return SLBT_NESTED_ERROR(dctx); /* /dstdir/libfoo.lib.a */ @@ -310,7 +310,7 @@ static int slbt_exec_install_library_wrapper( slbt_unmap_file(mapinfo); /* cp libfoo.la.slibtool.instal /dstdir/libfoo.la */ - if (slbt_util_copy_file(dctx,ectx,clainame,instname)) + if (slbt_util_copy_file(ectx,clainame,instname)) return SLBT_NESTED_ERROR(dctx); return 0; @@ -555,7 +555,8 @@ static int slbt_exec_install_entry( farchive = false; if (farchive) - if (slbt_util_copy_file(dctx,ectx, + if (slbt_util_copy_file( + ectx, srcfile, dest ? (char *)dest->arg : *dst)) return SLBT_NESTED_ERROR(dctx); @@ -683,7 +684,7 @@ static int slbt_exec_install_entry( if (fpe) { /* copy: .libs/libfoo.so.x.y.z --> libfoo.so.x */ if (slbt_util_copy_file( - dctx,ectx, + ectx, srcfile, dlnkname)) return SLBT_NESTED_ERROR(dctx); diff --git a/src/logic/slbt_exec_link.c b/src/logic/slbt_exec_link.c index 4545110..428c13a 100644 --- a/src/logic/slbt_exec_link.c +++ b/src/logic/slbt_exec_link.c @@ -120,7 +120,7 @@ static int slbt_exec_link_create_library_symlink( if (fmajor && (dctx->cctx->drvflags & SLBT_DRIVER_IMAGE_PE)) return slbt_util_copy_file( - dctx,ectx, + ectx, target,lnkname); else return slbt_create_symlink( -- cgit v1.2.3