diff options
| author | midipix <writeonce@midipix.org> | 2024-02-19 02:50:41 +0000 |
|---|---|---|
| committer | midipix <writeonce@midipix.org> | 2024-02-19 02:59:32 +0000 |
| commit | 4373b876273680b58ab1745a203b8bfc53f1de9d (patch) | |
| tree | ee01922e8956560093106871864723b39c2dfac9 | |
| parent | 932ec07826884a89addd9d0f3b436748dba65881 (diff) | |
| download | slibtool-4373b876273680b58ab1745a203b8bfc53f1de9d.tar.bz2 slibtool-4373b876273680b58ab1745a203b8bfc53f1de9d.tar.xz | |
library api's: _host_ (host and flavor interfaces) namespace overhaul.
| -rw-r--r-- | include/slibtool/slibtool.h | 6 | ||||
| -rw-r--r-- | src/driver/slbt_host_params.c | 6 | ||||
| -rw-r--r-- | src/logic/slbt_exec_install.c | 2 | ||||
| -rw-r--r-- | src/logic/slbt_exec_link.c | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/include/slibtool/slibtool.h b/include/slibtool/slibtool.h index 0ba929b..ce051fa 100644 --- a/include/slibtool/slibtool.h +++ b/include/slibtool/slibtool.h @@ -369,10 +369,10 @@ slbt_api int slbt_exec_link (const struct slbt_driver_ctx *, struct slbt_api int slbt_exec_uninstall (const struct slbt_driver_ctx *, struct slbt_exec_ctx *); slbt_api int slbt_exec_ar (const struct slbt_driver_ctx *, struct slbt_exec_ctx *); -slbt_api int slbt_set_alternate_host (const struct slbt_driver_ctx *, const char * host, const char * flavor); -slbt_api void slbt_reset_alternate_host (const struct slbt_driver_ctx *); +slbt_api int slbt_host_set_althost (const struct slbt_driver_ctx *, const char * host, const char * flavor); +slbt_api void slbt_host_reset_althost (const struct slbt_driver_ctx *); -slbt_api int slbt_get_flavor_settings (const char *, const struct slbt_flavor_settings **); +slbt_api int slbt_host_flavor_settings (const char *, const struct slbt_flavor_settings **); /* utility helper interfaces */ slbt_api int slbt_util_import_archive (const struct slbt_driver_ctx *, struct slbt_exec_ctx *, diff --git a/src/driver/slbt_host_params.c b/src/driver/slbt_host_params.c index dd4e787..0a8bc11 100644 --- a/src/driver/slbt_host_params.c +++ b/src/driver/slbt_host_params.c @@ -624,7 +624,7 @@ slbt_hidden int slbt_init_ldrpath( } -void slbt_reset_alternate_host(const struct slbt_driver_ctx * ctx) +void slbt_host_reset_althost(const struct slbt_driver_ctx * ctx) { struct slbt_driver_ctx_alloc * ictx; uintptr_t addr; @@ -636,7 +636,7 @@ void slbt_reset_alternate_host(const struct slbt_driver_ctx * ctx) slbt_free_host_params(&ictx->ctx.ahost); } -int slbt_set_alternate_host( +int slbt_host_set_althost( const struct slbt_driver_ctx * ctx, const char * host, const char * flavor) @@ -686,7 +686,7 @@ int slbt_set_alternate_host( return 0; } -int slbt_get_flavor_settings( +int slbt_host_flavor_settings( const char * flavor, const struct slbt_flavor_settings ** settings) { diff --git a/src/logic/slbt_exec_install.c b/src/logic/slbt_exec_install.c index bca494b..dc311f8 100644 --- a/src/logic/slbt_exec_install.c +++ b/src/logic/slbt_exec_install.c @@ -537,7 +537,7 @@ static int slbt_exec_install_entry( /* symlink-based alternate host */ if (!fstatic) { - if (slbt_set_alternate_host(dctx,host,host)) + if (slbt_host_set_althost(dctx,host,host)) return SLBT_NESTED_ERROR(dctx); fpe = !strcmp(dctx->cctx->asettings.imagefmt,"pe"); diff --git a/src/logic/slbt_exec_link.c b/src/logic/slbt_exec_link.c index e2848ea..e721bc6 100644 --- a/src/logic/slbt_exec_link.c +++ b/src/logic/slbt_exec_link.c @@ -254,7 +254,7 @@ int slbt_exec_link( if (fstaticonly && dot && !strcmp(dot,".la")) { const struct slbt_flavor_settings * dflavor; - if (slbt_get_flavor_settings("default",&dflavor) < 0) + if (slbt_host_flavor_settings("default",&dflavor) < 0) return SLBT_CUSTOM_ERROR(dctx,SLBT_ERR_LINK_FLOW); if (strcmp(dctx->cctx->settings.dsosuffix,dflavor->dsosuffix)) { @@ -319,7 +319,7 @@ int slbt_exec_link( if (dot && !strcmp(dot,".la") && dctx->cctx->rpath && !fstaticonly) { const struct slbt_flavor_settings * dflavor; - if (slbt_get_flavor_settings("default",&dflavor) < 0) + if (slbt_host_flavor_settings("default",&dflavor) < 0) return SLBT_CUSTOM_ERROR(dctx,SLBT_ERR_LINK_FLOW); /* -shrext support */ |