From 3fa3e3256e30f62d24889b572e3ae65ffb63876a Mon Sep 17 00:00:00 2001 From: midipix Date: Mon, 19 Feb 2024 01:19:51 +0000 Subject: library api's: _au_ (archiver utility) namespace overhaul. --- include/slibtool/slibtool.h | 8 +++---- src/arbits/output/slbt_ar_output_arname.c | 18 +++++++-------- src/arbits/output/slbt_ar_output_mapfile.c | 6 ++--- src/arbits/output/slbt_ar_output_members.c | 36 +++++++++++++++--------------- src/arbits/output/slbt_ar_output_symbols.c | 12 +++++----- src/logic/slbt_exec_ar.c | 8 +++---- 6 files changed, 44 insertions(+), 44 deletions(-) diff --git a/include/slibtool/slibtool.h b/include/slibtool/slibtool.h index b36d964..e1be03f 100644 --- a/include/slibtool/slibtool.h +++ b/include/slibtool/slibtool.h @@ -423,10 +423,10 @@ slbt_api int slbt_output_error_record (const struct slbt_driver_ctx *, const s slbt_api int slbt_output_error_vector (const struct slbt_driver_ctx *); /* archiver utility api */ -slbt_api int slbt_ar_output_arname (const struct slbt_archive_ctx *); -slbt_api int slbt_ar_output_members (const struct slbt_archive_meta *); -slbt_api int slbt_ar_output_symbols (const struct slbt_archive_meta *); -slbt_api int slbt_ar_output_mapfile (const struct slbt_archive_meta *); +slbt_api int slbt_au_output_arname (const struct slbt_archive_ctx *); +slbt_api int slbt_au_output_members (const struct slbt_archive_meta *); +slbt_api int slbt_au_output_symbols (const struct slbt_archive_meta *); +slbt_api int slbt_au_output_mapfile (const struct slbt_archive_meta *); /* package info */ slbt_api const struct slbt_source_version * slbt_source_version(void); diff --git a/src/arbits/output/slbt_ar_output_arname.c b/src/arbits/output/slbt_ar_output_arname.c index 38917e7..131e749 100644 --- a/src/arbits/output/slbt_ar_output_arname.c +++ b/src/arbits/output/slbt_ar_output_arname.c @@ -15,7 +15,7 @@ | SLBT_PRETTY_POSIX \ | SLBT_PRETTY_HEXDATA) -static int slbt_ar_output_arname_impl( +static int slbt_au_output_arname_impl( const struct slbt_driver_ctx * dctx, const struct slbt_archive_ctx * actx, const struct slbt_fd_ctx * fdctx, @@ -32,12 +32,12 @@ static int slbt_ar_output_arname_impl( return 0; } -static int slbt_ar_output_arname_posix( +static int slbt_au_output_arname_posix( const struct slbt_driver_ctx * dctx, const struct slbt_archive_ctx * actx, const struct slbt_fd_ctx * fdctx) { - if (slbt_ar_output_arname_impl( + if (slbt_au_output_arname_impl( dctx,actx,fdctx, "%s:\n") < 0) return SLBT_NESTED_ERROR(dctx); @@ -45,12 +45,12 @@ static int slbt_ar_output_arname_posix( return 0; } -static int slbt_ar_output_arname_yaml( +static int slbt_au_output_arname_yaml( const struct slbt_driver_ctx * dctx, const struct slbt_archive_ctx * actx, const struct slbt_fd_ctx * fdctx) { - if (slbt_ar_output_arname_impl( + if (slbt_au_output_arname_impl( dctx,actx,fdctx, "Archive:\n" " - Meta:\n" @@ -60,7 +60,7 @@ static int slbt_ar_output_arname_yaml( return 0; } -int slbt_ar_output_arname(const struct slbt_archive_ctx * actx) +int slbt_au_output_arname(const struct slbt_archive_ctx * actx) { const struct slbt_driver_ctx * dctx; struct slbt_fd_ctx fdctx; @@ -72,15 +72,15 @@ int slbt_ar_output_arname(const struct slbt_archive_ctx * actx) switch (dctx->cctx->fmtflags & SLBT_PRETTY_FLAGS) { case SLBT_PRETTY_YAML: - return slbt_ar_output_arname_yaml( + return slbt_au_output_arname_yaml( dctx,actx,&fdctx); case SLBT_PRETTY_POSIX: - return slbt_ar_output_arname_posix( + return slbt_au_output_arname_posix( dctx,actx,&fdctx); default: - return slbt_ar_output_arname_yaml( + return slbt_au_output_arname_yaml( dctx,actx,&fdctx); } } diff --git a/src/arbits/output/slbt_ar_output_mapfile.c b/src/arbits/output/slbt_ar_output_mapfile.c index 1c5534e..6bf974a 100644 --- a/src/arbits/output/slbt_ar_output_mapfile.c +++ b/src/arbits/output/slbt_ar_output_mapfile.c @@ -15,7 +15,7 @@ #include "slibtool_errinfo_impl.h" #include "slibtool_ar_impl.h" -static int slbt_ar_output_mapfile_impl( +static int slbt_au_output_mapfile_impl( const struct slbt_driver_ctx * dctx, struct slbt_archive_meta_impl * mctx, int fdout) @@ -91,12 +91,12 @@ static int slbt_create_mapfile_impl( fdout = fdctx.fdout; } - return slbt_ar_output_mapfile_impl( + return slbt_au_output_mapfile_impl( dctx,mctx,fdout); } -int slbt_ar_output_mapfile(const struct slbt_archive_meta * meta) +int slbt_au_output_mapfile(const struct slbt_archive_meta * meta) { return slbt_create_mapfile_impl(meta,0,0); } diff --git a/src/arbits/output/slbt_ar_output_members.c b/src/arbits/output/slbt_ar_output_members.c index bb6686b..6c60163 100644 --- a/src/arbits/output/slbt_ar_output_members.c +++ b/src/arbits/output/slbt_ar_output_members.c @@ -31,7 +31,7 @@ const char slbt_ar_perm_strs[8][4] = { {'r','w','x','\0'} }; -static unsigned slbt_ar_output_decimal_len_from_val(size_t val, unsigned min) +static unsigned slbt_au_output_decimal_len_from_val(size_t val, unsigned min) { unsigned ret; @@ -41,7 +41,7 @@ static unsigned slbt_ar_output_decimal_len_from_val(size_t val, unsigned min) return (ret > min) ? ret : min; } -static int slbt_ar_output_one_member_posix( +static int slbt_au_output_one_member_posix( int fdout, struct ar_meta_member_info * memberp) { @@ -50,7 +50,7 @@ static int slbt_ar_output_one_member_posix( memberp->ar_file_header.ar_member_name); } -static int slbt_ar_output_one_member_posix_verbose( +static int slbt_au_output_one_member_posix_verbose( int fdout, struct ar_meta_member_info * memberp, const char * fmtstr, @@ -86,7 +86,7 @@ static int slbt_ar_output_one_member_posix_verbose( memberp->ar_file_header.ar_member_name); } -static int slbt_ar_output_members_posix( +static int slbt_au_output_members_posix( const struct slbt_driver_ctx * dctx, const struct slbt_archive_meta * meta, const struct slbt_fd_ctx * fdctx) @@ -116,9 +116,9 @@ static int slbt_ar_output_members_posix( if ((testval = memberp[0]->ar_file_header.ar_gid) > gidlen) gidlen = testval; - sizelen = slbt_ar_output_decimal_len_from_val(sizelen,6); - uidlen = slbt_ar_output_decimal_len_from_val(uidlen,1); - gidlen = slbt_ar_output_decimal_len_from_val(gidlen,1); + sizelen = slbt_au_output_decimal_len_from_val(sizelen,6); + uidlen = slbt_au_output_decimal_len_from_val(uidlen,1); + gidlen = slbt_au_output_decimal_len_from_val(gidlen,1); arloc = newlocale(LC_ALL,setlocale(LC_ALL,0),0); sprintf( @@ -143,11 +143,11 @@ static int slbt_ar_output_members_posix( default: if (arloc) { - if (slbt_ar_output_one_member_posix_verbose( + if (slbt_au_output_one_member_posix_verbose( fdout,*memberp,fmtstr,arloc) < 0) return SLBT_SYSTEM_ERROR(dctx,0); } else { - if (slbt_ar_output_one_member_posix( + if (slbt_au_output_one_member_posix( fdout,*memberp) < 0) return SLBT_SYSTEM_ERROR(dctx,0); } @@ -160,7 +160,7 @@ static int slbt_ar_output_members_posix( return 0; } -static int slbt_ar_output_one_member_yaml( +static int slbt_au_output_one_member_yaml( int fdout, struct ar_meta_member_info * memberp) { @@ -170,7 +170,7 @@ static int slbt_ar_output_one_member_yaml( memberp->ar_file_header.ar_member_name); } -static int slbt_ar_output_one_member_yaml_verbose( +static int slbt_au_output_one_member_yaml_verbose( int fdout, struct ar_meta_member_info * memberp, locale_t arlocale) @@ -204,7 +204,7 @@ static int slbt_ar_output_one_member_yaml_verbose( memberp->ar_file_header.ar_file_mode); } -static int slbt_ar_output_members_yaml( +static int slbt_au_output_members_yaml( const struct slbt_driver_ctx * dctx, const struct slbt_archive_meta * meta, const struct slbt_fd_ctx * fdctx) @@ -232,11 +232,11 @@ static int slbt_ar_output_members_yaml( default: if (arloc) { - if (slbt_ar_output_one_member_yaml_verbose( + if (slbt_au_output_one_member_yaml_verbose( fdout,*memberp,arloc) < 0) return SLBT_SYSTEM_ERROR(dctx,0); } else { - if (slbt_ar_output_one_member_yaml( + if (slbt_au_output_one_member_yaml( fdout,*memberp) < 0) return SLBT_SYSTEM_ERROR(dctx,0); } @@ -249,7 +249,7 @@ static int slbt_ar_output_members_yaml( return 0; } -int slbt_ar_output_members(const struct slbt_archive_meta * meta) +int slbt_au_output_members(const struct slbt_archive_meta * meta) { const struct slbt_driver_ctx * dctx; struct slbt_fd_ctx fdctx; @@ -264,15 +264,15 @@ int slbt_ar_output_members(const struct slbt_archive_meta * meta) switch (dctx->cctx->fmtflags & SLBT_PRETTY_FLAGS) { case SLBT_PRETTY_YAML: - return slbt_ar_output_members_yaml( + return slbt_au_output_members_yaml( dctx,meta,&fdctx); case SLBT_PRETTY_POSIX: - return slbt_ar_output_members_posix( + return slbt_au_output_members_posix( dctx,meta,&fdctx); default: - return slbt_ar_output_members_yaml( + return slbt_au_output_members_yaml( dctx,meta,&fdctx); } } diff --git a/src/arbits/output/slbt_ar_output_symbols.c b/src/arbits/output/slbt_ar_output_symbols.c index 0598d2e..fb9065b 100644 --- a/src/arbits/output/slbt_ar_output_symbols.c +++ b/src/arbits/output/slbt_ar_output_symbols.c @@ -19,7 +19,7 @@ | SLBT_PRETTY_POSIX \ | SLBT_PRETTY_HEXDATA) -static int slbt_ar_output_symbols_posix( +static int slbt_au_output_symbols_posix( const struct slbt_driver_ctx * dctx, struct slbt_archive_meta_impl * mctx, const struct slbt_fd_ctx * fdctx) @@ -61,7 +61,7 @@ static int slbt_ar_output_symbols_posix( return 0; } -static int slbt_ar_output_symbols_yaml( +static int slbt_au_output_symbols_yaml( const struct slbt_driver_ctx * dctx, struct slbt_archive_meta_impl * mctx, const struct slbt_fd_ctx * fdctx) @@ -73,7 +73,7 @@ static int slbt_ar_output_symbols_yaml( return 0; } -int slbt_ar_output_symbols(const struct slbt_archive_meta * meta) +int slbt_au_output_symbols(const struct slbt_archive_meta * meta) { struct slbt_archive_meta_impl * mctx; const struct slbt_driver_ctx * dctx; @@ -90,15 +90,15 @@ int slbt_ar_output_symbols(const struct slbt_archive_meta * meta) switch (dctx->cctx->fmtflags & SLBT_PRETTY_FLAGS) { case SLBT_PRETTY_YAML: - return slbt_ar_output_symbols_yaml( + return slbt_au_output_symbols_yaml( dctx,mctx,&fdctx); case SLBT_PRETTY_POSIX: - return slbt_ar_output_symbols_posix( + return slbt_au_output_symbols_posix( dctx,mctx,&fdctx); default: - return slbt_ar_output_symbols_yaml( + return slbt_au_output_symbols_yaml( dctx,mctx,&fdctx); } } diff --git a/src/logic/slbt_exec_ar.c b/src/logic/slbt_exec_ar.c index ede3f72..7614ee7 100644 --- a/src/logic/slbt_exec_ar.c +++ b/src/logic/slbt_exec_ar.c @@ -93,19 +93,19 @@ static int slbt_exec_ar_perform_archive_actions( for (arctxp=arctxv; *arctxp; arctxp++) { if (dctx->cctx->fmtflags & SLBT_DRIVER_MODE_AR_OUTPUTS) - if (farname && (slbt_ar_output_arname(*arctxp) < 0)) + if (farname && (slbt_au_output_arname(*arctxp) < 0)) return SLBT_NESTED_ERROR(dctx); if (dctx->cctx->fmtflags & SLBT_OUTPUT_ARCHIVE_MEMBERS) - if (slbt_ar_output_members((*arctxp)->meta) < 0) + if (slbt_au_output_members((*arctxp)->meta) < 0) return SLBT_NESTED_ERROR(dctx); if (dctx->cctx->fmtflags & SLBT_OUTPUT_ARCHIVE_SYMBOLS) - if (slbt_ar_output_symbols((*arctxp)->meta) < 0) + if (slbt_au_output_symbols((*arctxp)->meta) < 0) return SLBT_NESTED_ERROR(dctx); if (dctx->cctx->fmtflags & SLBT_OUTPUT_ARCHIVE_MAPFILE) - if (slbt_ar_output_mapfile((*arctxp)->meta) < 0) + if (slbt_au_output_mapfile((*arctxp)->meta) < 0) return SLBT_NESTED_ERROR(dctx); } -- cgit v1.2.3