library api's: _util_ (utility helper interfaces) namespace overhaul.

5 files changed, 9 insertions, 9 deletions

diff --git a/src/logic/linkcmd/slbt_linkcmd_archive.c b/src/logic/linkcmd/slbt_linkcmd_archive.c
index e3ac657..9fb1778 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_archive_import(dctx,ectx,output,*parg))
+			if (slbt_util_import_archive(dctx,ectx,output,*parg))
 				return SLBT_NESTED_ERROR(dctx);
 
 	return 0;
diff --git a/src/logic/linkcmd/slbt_linkcmd_dsolib.c b/src/logic/linkcmd/slbt_linkcmd_dsolib.c
index ed9aa6c..8ae9395 100644
--- a/src/logic/linkcmd/slbt_linkcmd_dsolib.c
+++ b/src/logic/linkcmd/slbt_linkcmd_dsolib.c
@@ -243,7 +243,7 @@ slbt_hidden int slbt_exec_link_create_library(
 	}
 
 	/* cwd */
-	if (slbt_realpath(fdcwd,".",O_DIRECTORY,cwd,sizeof(cwd)))
+	if (slbt_util_realpath(fdcwd,".",O_DIRECTORY,cwd,sizeof(cwd)))
 		return SLBT_SYSTEM_ERROR(dctx,0);
 
 	/* .libs/libfoo.so --> -L.libs -lfoo */
diff --git a/src/logic/linkcmd/slbt_linkcmd_executable.c b/src/logic/linkcmd/slbt_linkcmd_executable.c
index a4c3b81..3a47a49 100644
--- a/src/logic/linkcmd/slbt_linkcmd_executable.c
+++ b/src/logic/linkcmd/slbt_linkcmd_executable.c
@@ -136,7 +136,7 @@ slbt_hidden int slbt_exec_link_create_executable(
 	verinfo = slbt_source_version();
 
 	/* cwd, DL_PATH fixup */
-	if (slbt_realpath(fdcwd,".",O_DIRECTORY,cwd,sizeof(cwd)))
+	if (slbt_util_realpath(fdcwd,".",O_DIRECTORY,cwd,sizeof(cwd)))
 		return SLBT_SYSTEM_ERROR(dctx,0);
 
 	slbt_emit_fdwrap_dl_path_fixup(
diff --git a/src/logic/slbt_exec_install.c b/src/logic/slbt_exec_install.c
index 395e972..7b30eb4 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_copy_file(dctx,ectx,srcbuf,dstdir))
+	if (slbt_util_copy_file(dctx,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_copy_file(dctx,ectx,srcbuf,dstdir))
+	if (slbt_util_copy_file(dctx,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_copy_file(dctx,ectx,clainame,instname))
+	if (slbt_util_copy_file(dctx,ectx,clainame,instname))
 		return SLBT_NESTED_ERROR(dctx);
 
 	return 0;
@@ -555,7 +555,7 @@ static int slbt_exec_install_entry(
 		farchive = false;
 
 	if (farchive)
-		if (slbt_copy_file(dctx,ectx,
+		if (slbt_util_copy_file(dctx,ectx,
 				srcfile,
 				dest ? (char *)dest->arg : *dst))
 			return SLBT_NESTED_ERROR(dctx);
@@ -682,7 +682,7 @@ static int slbt_exec_install_entry(
 
 	if (fpe) {
 		/* copy: .libs/libfoo.so.x.y.z --> libfoo.so.x */
-		if (slbt_copy_file(
+		if (slbt_util_copy_file(
 				dctx,ectx,
 				srcfile,
 				dlnkname))
diff --git a/src/logic/slbt_exec_link.c b/src/logic/slbt_exec_link.c
index 3b6bc6f..a08abd4 100644
--- a/src/logic/slbt_exec_link.c
+++ b/src/logic/slbt_exec_link.c
@@ -119,7 +119,7 @@ static int slbt_exec_link_create_library_symlink(
 
 
 	if (fmajor && (dctx->cctx->drvflags & SLBT_DRIVER_IMAGE_PE))
-		return slbt_copy_file(
+		return slbt_util_copy_file(
 			dctx,ectx,
 			target,lnkname);
 	else