summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/perk/perk.h2
-rw-r--r--include/perk/perk_output.h2
-rw-r--r--project/common.mk2
-rw-r--r--src/driver/pe_amain.c4
-rw-r--r--src/driver/pe_driver_ctx.c4
-rw-r--r--src/internal/perk_driver_impl.h2
-rw-r--r--src/output/pe_output_image_category.c (renamed from src/output/pe_output_image_type.c)2
-rw-r--r--src/skin/pe_skin_default.c2
8 files changed, 10 insertions, 10 deletions
diff --git a/include/perk/perk.h b/include/perk/perk.h
index 88aed0b..b24be37 100644
--- a/include/perk/perk.h
+++ b/include/perk/perk.h
@@ -170,7 +170,7 @@ perk_api void pe_free_unit_ctx (struct pe_unit_ctx *);
/* utility api */
perk_api int pe_main (int, char **, char **);
-perk_api int pe_output_image_type (const struct pe_driver_ctx *, const struct pe_unit_ctx *, FILE *);
+perk_api int pe_output_image_category (const struct pe_driver_ctx *, const struct pe_unit_ctx *, FILE *);
perk_api int pe_output_export_symbols (const struct pe_driver_ctx *, const struct pe_image_meta *, FILE *);
perk_api int pe_output_import_libraries(const struct pe_driver_ctx *, const struct pe_image_meta *, FILE *);
perk_api int pe_output_error_record (const struct pe_driver_ctx *, const struct pe_error_info *);
diff --git a/include/perk/perk_output.h b/include/perk/perk_output.h
index ab91f87..6ef9054 100644
--- a/include/perk/perk_output.h
+++ b/include/perk/perk_output.h
@@ -9,7 +9,7 @@
#define PERK_OUTPUT_EXPORT_SYMS 0x00000001
#define PERK_OUTPUT_IMPORT_LIBS 0x00000002
#define PERK_OUTPUT_IMPORT_SYMS 0x00000004
-#define PERK_OUTPUT_IMAGE_TYPE 0x00000008
+#define PERK_OUTPUT_IMAGE_CATEGORY 0x00000008
#define PERK_OUTPUT_IMAGE_SECTIONS 0x00000010
diff --git a/project/common.mk b/project/common.mk
index 70041dd..f7eb597 100644
--- a/project/common.mk
+++ b/project/common.mk
@@ -10,7 +10,7 @@ API_SRCS = \
src/logic/pe_map_raw_image.c \
src/output/pe_output_error.c \
src/output/pe_output_export_symbols.c \
- src/output/pe_output_image_type.c \
+ src/output/pe_output_image_category.c \
src/output/pe_output_import_libraries.c \
src/reader/pe_read_coff_header.c \
src/reader/pe_read_dos_header.c \
diff --git a/src/driver/pe_amain.c b/src/driver/pe_amain.c
index d23e9fe..3096561 100644
--- a/src/driver/pe_amain.c
+++ b/src/driver/pe_amain.c
@@ -62,8 +62,8 @@ static void pe_perform_unit_actions(
int fpara = 0;
uint64_t flags = dctx->cctx->fmtflags;
- if (flags & PERK_OUTPUT_IMAGE_TYPE)
- pe_output_image_type(dctx,uctx,0);
+ if (flags & PERK_OUTPUT_IMAGE_CATEGORY)
+ pe_output_image_category(dctx,uctx,0);
if (flags & PERK_OUTPUT_EXPORT_SYMS) {
pe_output_export_symbols(dctx,uctx->meta,0);
diff --git a/src/driver/pe_driver_ctx.c b/src/driver/pe_driver_ctx.c
index 8ca3ba6..32faa7d 100644
--- a/src/driver/pe_driver_ctx.c
+++ b/src/driver/pe_driver_ctx.c
@@ -160,8 +160,8 @@ int pe_get_driver_ctx(
pretty = entry->arg;
break;
- case TAG_IMGTYPE:
- cctx.fmtflags |= PERK_OUTPUT_IMAGE_TYPE;
+ case TAG_CATEGORY:
+ cctx.fmtflags |= PERK_OUTPUT_IMAGE_CATEGORY;
break;
case TAG_SECTIONS:
diff --git a/src/internal/perk_driver_impl.h b/src/internal/perk_driver_impl.h
index 5ca0bc3..f52e328 100644
--- a/src/internal/perk_driver_impl.h
+++ b/src/internal/perk_driver_impl.h
@@ -16,7 +16,7 @@ enum app_tags {
TAG_VERSION,
TAG_OUTPUT,
TAG_PRETTY,
- TAG_IMGTYPE,
+ TAG_CATEGORY,
TAG_SECTIONS,
TAG_EXPSYMS,
TAG_IMPLIBS,
diff --git a/src/output/pe_output_image_type.c b/src/output/pe_output_image_category.c
index 3df5316..2550267 100644
--- a/src/output/pe_output_image_type.c
+++ b/src/output/pe_output_image_category.c
@@ -10,7 +10,7 @@
#include <perk/perk_output.h>
#include "perk_errinfo_impl.h"
-int pe_output_image_type(
+int pe_output_image_category(
const struct pe_driver_ctx * dctx,
const struct pe_unit_ctx * uctx,
FILE * fout)
diff --git a/src/skin/pe_skin_default.c b/src/skin/pe_skin_default.c
index 8bf40e1..baafc8a 100644
--- a/src/skin/pe_skin_default.c
+++ b/src/skin/pe_skin_default.c
@@ -14,7 +14,7 @@ const struct argv_option pe_default_options[] = {
{"pretty", 'p',TAG_PRETTY,ARGV_OPTARG_REQUIRED,0,"yaml|dlltool",0,
"format output for parsing by %s"},
- {"type", 't',TAG_IMGTYPE,ARGV_OPTARG_NONE,0,0,0,
+ {"category", 'c',TAG_CATEGORY,ARGV_OPTARG_NONE,0,0,0,
"print image type"},
{"sections", 's',TAG_SECTIONS,ARGV_OPTARG_NONE,0,0,0,