From 67bba74b591b7d000eb68013334ba923ca4f216c Mon Sep 17 00:00:00 2001
From: midipix <writeonce@midipix.org>
Date: Tue, 24 Jul 2018 03:29:42 -0400
Subject: output interfaces: revised API and implementation to use fdctx and
 pure fdio.

---
 src/output/pe_output_idata_libraries.c | 50 ++++++++++++++++++++--------------
 1 file changed, 30 insertions(+), 20 deletions(-)

(limited to 'src/output/pe_output_idata_libraries.c')

diff --git a/src/output/pe_output_idata_libraries.c b/src/output/pe_output_idata_libraries.c
index a5c49bf..b68f77f 100644
--- a/src/output/pe_output_idata_libraries.c
+++ b/src/output/pe_output_idata_libraries.c
@@ -12,64 +12,74 @@
 
 #include <perk/perk.h>
 #include <perk/perk_output.h>
+#include "perk_driver_impl.h"
+#include "perk_dprintf_impl.h"
 #include "perk_errinfo_impl.h"
 
-static int pretty_header(const struct pe_common_ctx * cctx, FILE * fout)
+static int pretty_header(
+	int				fdout,
+	const struct pe_common_ctx *	cctx)
 {
 	return (cctx->fmtflags & PERK_PRETTY_YAML)
-		? fputs("imports:\n",fout)
+		? pe_dprintf(fdout,"imports:\n")
 		: 0;
 }
 
-static int pretty_implib_header(const struct pe_common_ctx * cctx, const char * name, FILE * fout)
+static int pretty_implib_header(
+	int				fdout,
+	const struct pe_common_ctx *	cctx,
+	const char *			name)
 {
 	if ((cctx->fmtflags & PERK_PRETTY_YAML) && (cctx->fmtflags & PERK_OUTPUT_IMPORT_SYMS))
-		return fprintf(fout,"  %s:\n",name);
+		return pe_dprintf(fdout,"  %s:\n",name);
 	else if (cctx->fmtflags & PERK_PRETTY_YAML)
-		return fprintf(fout,"- %s:\n",name);
+		return pe_dprintf(fdout,"- %s:\n",name);
 	else if (cctx->fmtflags & PERK_OUTPUT_IMPORT_SYMS)
-		return fprintf(fout,"%s:\n",name);
+		return pe_dprintf(fdout,"%s:\n",name);
 	else
-		return fprintf(fout,"%s\n",name);
+		return pe_dprintf(fdout,"%s\n",name);
 }
 
-static int pretty_implib_item(const struct pe_common_ctx * cctx, const char * name, FILE * fout)
+static int pretty_implib_item(
+	int				fdout,
+	const struct pe_common_ctx *	cctx,
+	const char *			name)
 {
 	if (cctx->fmtflags & PERK_PRETTY_YAML)
-		return fprintf(fout,"  - %s\n",name);
+		return pe_dprintf(fdout,"  - %s\n",name);
 	else
-		return fprintf(fout,"%s\n",name);
+		return pe_dprintf(fdout,"%s\n",name);
 }
 
 int pe_output_import_libraries(
 	const struct pe_driver_ctx *	dctx,
-	const struct pe_image_meta *	m,
-	FILE *				fout)
+	const struct pe_image_meta *	m)
 {
+	int				fdout;
 	int				i;
 	unsigned			j;
 	const struct pe_common_ctx *	cctx = dctx->cctx;
 
+	fdout = pe_driver_fdout(dctx);
+
 	if (!m->m_stats.t_nimplibs)
 		return 0;
 
-	if (!fout)
-		fout = stdout;
-
-	if ((pretty_header(cctx,fout)) < 0)
+	if ((pretty_header(fdout,cctx)) < 0)
 		return PERK_FILE_ERROR(dctx);
 
 	for (i=0; i<m->m_stats.t_nimplibs; i++) {
-		if ((pretty_implib_header(cctx,m->m_idata[i].ih_name,fout)) < 0)
+		if ((pretty_implib_header(
+				fdout,cctx,
+				m->m_idata[i].ih_name)) < 0)
 			return PERK_FILE_ERROR(dctx);
 
 		if (cctx->fmtflags & PERK_OUTPUT_IMPORT_SYMS)
 			for (j=0; j<m->m_idata[i].ih_count; j++)
 				if (m->m_idata[i].ih_items[j].ii_name)
 					if ((pretty_implib_item(
-							cctx,
-							m->m_idata[i].ih_items[j].ii_name,
-							fout)) < 0)
+							fdout,cctx,
+							m->m_idata[i].ih_items[j].ii_name)) < 0)
 						return PERK_FILE_ERROR(dctx);
 	}
 
-- 
cgit v1.2.3