summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authormidipix <writeonce@midipix.org>2024-02-21 05:50:30 +0000
committermidipix <writeonce@midipix.org>2024-02-21 05:50:30 +0000
commitf3e7bb09f083de850269a6d0982ca4d839f4d1ba (patch)
treeeddb57bbb144a06afa1f3ae261db7d1f9b32d3cd /src
parent2e30eb25a9f78fcb462c03c4766a8a8669c1f291 (diff)
downloadslibtool-f3e7bb09f083de850269a6d0982ca4d839f4d1ba.tar.bz2
slibtool-f3e7bb09f083de850269a6d0982ca4d839f4d1ba.tar.xz
slbt_util_import_archive(): simplify interface.
Diffstat (limited to 'src')
-rw-r--r--src/logic/linkcmd/slbt_linkcmd_archive.c2
-rw-r--r--src/util/slbt_archive_import.c14
2 files changed, 9 insertions, 7 deletions
diff --git a/src/logic/linkcmd/slbt_linkcmd_archive.c b/src/logic/linkcmd/slbt_linkcmd_archive.c
index f7ddc5c..051a563 100644
--- a/src/logic/linkcmd/slbt_linkcmd_archive.c
+++ b/src/logic/linkcmd/slbt_linkcmd_archive.c
@@ -165,7 +165,7 @@ slbt_hidden int slbt_exec_link_create_archive(
/* input objects associated with .la archives */
for (parg=ectx->cargv; *parg; parg++)
if (slbt_adjust_wrapper_argument(*parg,true))
- if (slbt_util_import_archive(dctx,ectx,output,*parg))
+ if (slbt_util_import_archive(ectx,output,*parg))
return SLBT_NESTED_ERROR(dctx);
return 0;
diff --git a/src/util/slbt_archive_import.c b/src/util/slbt_archive_import.c
index 5657fcc..d2d72c5 100644
--- a/src/util/slbt_archive_import.c
+++ b/src/util/slbt_archive_import.c
@@ -11,15 +11,14 @@
/* legacy fallback, no longer in use */
extern int slbt_util_import_archive_mri(
- const struct slbt_driver_ctx * dctx,
- struct slbt_exec_ctx * ectx,
+ const struct slbt_exec_ctx * ectx,
char * dstarchive,
char * srcarchive);
/* use slibtool's in-memory archive merging facility */
static int slbt_util_import_archive_impl(
- const struct slbt_driver_ctx * dctx,
- struct slbt_exec_ctx * ectx,
+ const struct slbt_driver_ctx * dctx,
+ const struct slbt_exec_ctx * ectx,
char * dstarchive,
char * srcarchive)
{
@@ -52,11 +51,14 @@ static int slbt_util_import_archive_impl(
int slbt_util_import_archive(
- const struct slbt_driver_ctx * dctx,
- struct slbt_exec_ctx * ectx,
+ const struct slbt_exec_ctx * ectx,
char * dstarchive,
char * srcarchive)
{
+ const struct slbt_driver_ctx * dctx;
+
+ dctx = (slbt_get_exec_ictx(ectx))->dctx;
+
if (slbt_symlink_is_a_placeholder(
slbt_driver_fdcwd(dctx),
srcarchive))