From cd4ace49776d042189f1066a357d1ca2d9f81332 Mon Sep 17 00:00:00 2001 From: midipix Date: Tue, 15 Nov 2016 09:37:28 -0500 Subject: output: renamed pe_output_image_type() --> pe_output_image_category(). --- src/output/pe_output_image_category.c | 50 +++++++++++++++++++++++++++++++++++ src/output/pe_output_image_type.c | 50 ----------------------------------- 2 files changed, 50 insertions(+), 50 deletions(-) create mode 100644 src/output/pe_output_image_category.c delete mode 100644 src/output/pe_output_image_type.c (limited to 'src/output') diff --git a/src/output/pe_output_image_category.c b/src/output/pe_output_image_category.c new file mode 100644 index 0000000..2550267 --- /dev/null +++ b/src/output/pe_output_image_category.c @@ -0,0 +1,50 @@ +/***************************************************************/ +/* perk: PE Resource Kit */ +/* Copyright (C) 2015--2016 Z. Gilboa */ +/* Released under GPLv2 and GPLv3; see COPYING.PERK. */ +/***************************************************************/ + +#include + +#include +#include +#include "perk_errinfo_impl.h" + +int pe_output_image_category( + const struct pe_driver_ctx * dctx, + const struct pe_unit_ctx * uctx, + FILE * fout) +{ + struct pe_info_string abi; + struct pe_info_string subtype; + struct pe_info_string subsystem; + struct pe_info_string framework; + const struct pe_image_meta * meta = uctx->meta; + + if (!fout) + fout = stdout; + + pe_get_image_abi (meta,&abi); + pe_get_image_subtype (meta,&subtype); + pe_get_image_subsystem(meta,&subsystem); + pe_get_image_framework(meta,&framework); + + if (dctx->cctx->fmtflags & PERK_PRETTY_YAML) { + if (fprintf(fout,"%s:\n- %s:\n- %s:\n- %s:\n- %s:\n", + *uctx->path, + abi.buffer, + subtype.buffer, + subsystem.buffer, + framework.buffer) < 0) + return PERK_FILE_ERROR(dctx); + } else { + if (fprintf(fout,"%s-%s-%s-%s\n", + abi.buffer, + subtype.buffer, + subsystem.buffer, + framework.buffer) < 0) + return PERK_FILE_ERROR(dctx); + } + + return 0; +} diff --git a/src/output/pe_output_image_type.c b/src/output/pe_output_image_type.c deleted file mode 100644 index 3df5316..0000000 --- a/src/output/pe_output_image_type.c +++ /dev/null @@ -1,50 +0,0 @@ -/***************************************************************/ -/* perk: PE Resource Kit */ -/* Copyright (C) 2015--2016 Z. Gilboa */ -/* Released under GPLv2 and GPLv3; see COPYING.PERK. */ -/***************************************************************/ - -#include - -#include -#include -#include "perk_errinfo_impl.h" - -int pe_output_image_type( - const struct pe_driver_ctx * dctx, - const struct pe_unit_ctx * uctx, - FILE * fout) -{ - struct pe_info_string abi; - struct pe_info_string subtype; - struct pe_info_string subsystem; - struct pe_info_string framework; - const struct pe_image_meta * meta = uctx->meta; - - if (!fout) - fout = stdout; - - pe_get_image_abi (meta,&abi); - pe_get_image_subtype (meta,&subtype); - pe_get_image_subsystem(meta,&subsystem); - pe_get_image_framework(meta,&framework); - - if (dctx->cctx->fmtflags & PERK_PRETTY_YAML) { - if (fprintf(fout,"%s:\n- %s:\n- %s:\n- %s:\n- %s:\n", - *uctx->path, - abi.buffer, - subtype.buffer, - subsystem.buffer, - framework.buffer) < 0) - return PERK_FILE_ERROR(dctx); - } else { - if (fprintf(fout,"%s-%s-%s-%s\n", - abi.buffer, - subtype.buffer, - subsystem.buffer, - framework.buffer) < 0) - return PERK_FILE_ERROR(dctx); - } - - return 0; -} -- cgit v1.2.3