library api: _info_ (image abi and framework info) namespace overhaul.

8 files changed, 17 insertions, 17 deletions

diff --git a/include/perk/perk.h b/include/perk/perk.h
index 34f20c0..07078ec 100644
--- a/include/perk/perk.h
+++ b/include/perk/perk.h
@@ -300,10 +300,10 @@ perk_api int  pe_get_expsym_by_name             (const struct pe_image_meta *, c
 perk_api int  pe_get_expsym_by_index            (const struct pe_image_meta *, unsigned,     struct pe_expsym *);
 
 /* info api */
-perk_api int  pe_get_image_abi                  (const struct pe_image_meta *, struct pe_info_string *);
-perk_api int  pe_get_image_subtype              (const struct pe_image_meta *, struct pe_info_string *);
-perk_api int  pe_get_image_subsystem            (const struct pe_image_meta *, struct pe_info_string *);
-perk_api int  pe_get_image_framework            (const struct pe_image_meta *, struct pe_info_string *);
+perk_api int  pe_info_get_image_abi             (const struct pe_image_meta *, struct pe_info_string *);
+perk_api int  pe_info_get_image_subtype         (const struct pe_image_meta *, struct pe_info_string *);
+perk_api int  pe_info_get_image_subsystem       (const struct pe_image_meta *, struct pe_info_string *);
+perk_api int  pe_info_get_image_framework       (const struct pe_image_meta *, struct pe_info_string *);
 
 /* low-level api */
 perk_api int  pe_read_dos_header                (const struct pe_raw_image_dos_hdr *,   struct pe_meta_image_dos_hdr *);
diff --git a/project/common.mk b/project/common.mk
index 24ecfad..ef923e4 100644
--- a/project/common.mk
+++ b/project/common.mk
@@ -15,10 +15,10 @@ API_SRCS = \
 	src/hexdump/pe_hexdump_coff_object_hdr.c \
 	src/hexdump/pe_hexdump_coff_opt_hdr.c \
 	src/hexdump/pe_hexdump_sec_tbl.c \
-	src/info/pe_get_image_abi.c \
-	src/info/pe_get_image_framework.c \
-	src/info/pe_get_image_subsystem.c \
-	src/info/pe_get_image_subtype.c \
+	src/info/pe_info_get_image_abi.c \
+	src/info/pe_info_get_image_framework.c \
+	src/info/pe_info_get_image_subsystem.c \
+	src/info/pe_info_get_image_subtype.c \
 	src/logic/pe_get_image_meta.c \
 	src/logic/pe_map_raw_image.c \
 	src/output/pe_output_error.c \
diff --git a/src/info/pe_get_image_abi.c b/src/info/pe_info_get_image_abi.c
index 0bdcbb8..faf141b 100644
--- a/src/info/pe_get_image_abi.c
+++ b/src/info/pe_info_get_image_abi.c
@@ -16,7 +16,7 @@ static const char * const pe_abi_str[PE_ABI_CAP] = {
 	[PE_ABI_PE64]           = "PE64",
 };
 
-int pe_get_image_abi(const struct pe_image_meta * m, struct pe_info_string * infostr)
+int pe_info_get_image_abi(const struct pe_image_meta * m, struct pe_info_string * infostr)
 {
 	int abi;
 
diff --git a/src/info/pe_get_image_framework.c b/src/info/pe_info_get_image_framework.c
index 31b6760..b56ae38 100644
--- a/src/info/pe_get_image_framework.c
+++ b/src/info/pe_info_get_image_framework.c
@@ -26,7 +26,7 @@ static const char * const pe_framework_str[PE_FRAMEWORK_CAP] = {
 	[PE_FRAMEWORK_WIN32]    = "win32",
 };
 
-int pe_get_image_framework(const struct pe_image_meta * m, struct pe_info_string * infostr)
+int pe_info_get_image_framework(const struct pe_image_meta * m, struct pe_info_string * infostr)
 {
 	int framework;
 
diff --git a/src/info/pe_get_image_subsystem.c b/src/info/pe_info_get_image_subsystem.c
index ac9655e..dfe1b80 100644
--- a/src/info/pe_get_image_subsystem.c
+++ b/src/info/pe_info_get_image_subsystem.c
@@ -23,7 +23,7 @@ static const char * const pe_subsystem_str[0x10] = {
 	[PE_IMAGE_SUBSYSTEM_XBOX]                     = "xbox"
 };
 
-int pe_get_image_subsystem(const struct pe_image_meta * m, struct pe_info_string * infostr)
+int pe_info_get_image_subsystem(const struct pe_image_meta * m, struct pe_info_string * infostr)
 {
 	int subsystem;
 
diff --git a/src/info/pe_get_image_subtype.c b/src/info/pe_info_get_image_subtype.c
index 4d7ae5d..4a2b1da 100644
--- a/src/info/pe_get_image_subtype.c
+++ b/src/info/pe_info_get_image_subtype.c
@@ -19,7 +19,7 @@ static const char * const pe_subtype_str[PE_SUBTYPE_CAP] = {
 	[PE_SUBTYPE_OBJ]            = "obj",
 };
 
-int pe_get_image_subtype(const struct pe_image_meta * m, struct pe_info_string * infostr)
+int pe_info_get_image_subtype(const struct pe_image_meta * m, struct pe_info_string * infostr)
 {
 	int subtype;
 
diff --git a/src/output/pe_output_image_category.c b/src/output/pe_output_image_category.c
index 863c84f..b3d72df 100644
--- a/src/output/pe_output_image_category.c
+++ b/src/output/pe_output_image_category.c
@@ -24,10 +24,10 @@ int pe_output_image_category(
 
 	fdout = pe_driver_fdout(dctx);
 
-	pe_get_image_abi      (meta,&abi);
-	pe_get_image_subtype  (meta,&subtype);
-	pe_get_image_subsystem(meta,&subsystem);
-	pe_get_image_framework(meta,&framework);
+	pe_info_get_image_abi      (meta,&abi);
+	pe_info_get_image_subtype  (meta,&subtype);
+	pe_info_get_image_subsystem(meta,&subsystem);
+	pe_info_get_image_framework(meta,&framework);
 
 	if (dctx->cctx->fmtflags & PERK_PRETTY_YAML) {
 		if (pe_dprintf(
diff --git a/src/output/pe_output_mdso_libraries.c b/src/output/pe_output_mdso_libraries.c
index c5ee1b4..c668564 100644
--- a/src/output/pe_output_mdso_libraries.c
+++ b/src/output/pe_output_mdso_libraries.c
@@ -180,7 +180,7 @@ int pe_output_mdso_libraries(
 	if (!m->m_stats.t_ndsolibs)
 		return 0;
 
-	if (pe_get_image_abi(m,0) == PE_ABI_UNSUPPORTED)
+	if (pe_info_get_image_abi(m,0) == PE_ABI_UNSUPPORTED)
 		return PERK_CUSTOM_ERROR(
 			dctx,PERK_ERR_UNSUPPORTED_ABI);