pe_output_image_symbols(): refactor, utilizing meta->m_symtbl.

1 files changed, 3 insertions, 18 deletions

diff --git a/src/output/pe_output_image_symbols.c b/src/output/pe_output_image_symbols.c
index 90fd618..408d964 100644
--- a/src/output/pe_output_image_symbols.c
+++ b/src/output/pe_output_image_symbols.c
@@ -19,16 +19,11 @@ int pe_output_image_symbols(
 	const struct pe_driver_ctx *	dctx,
 	const struct pe_image_meta *	meta)
 {
-	unsigned			i;
-	unsigned                        nrecs;
 	int				fdout;
-	char *				mark;
-	struct pe_raw_coff_symbol *	symtbl;
-	struct pe_meta_coff_symbol	symrec;
+	struct pe_meta_coff_symbol *	symrec;
 	const char * 			dash = "";
 
 	fdout = pe_driver_fdout(dctx);
-	nrecs = meta->m_coff.cfh_size_of_sym_tbl / sizeof(struct pe_raw_coff_symbol);
 
 	if (dctx->cctx->fmtflags & PERK_PRETTY_YAML) {
 		if (pe_dprintf(fdout,"symbols:\n") < 0)
@@ -37,19 +32,9 @@ int pe_output_image_symbols(
 		dash = "- ";
 	}
 
-	mark   = (char *)meta->r_image.map_addr;
-	symtbl = (struct pe_raw_coff_symbol *)(mark + meta->m_coff.cfh_ptr_to_sym_tbl);
-
-	for (i=0; i<nrecs; i++) {
-		pe_read_coff_symbol(
-			&symtbl[i],&symrec,
-			&meta->m_coff,meta->r_image.map_addr);
-
-		if (pe_dprintf(fdout,"%s%s\n",dash,symrec.cs_name) < 0)
+	for (symrec=meta->m_symtbl; symrec->cs_name; symrec++)
+		if (pe_dprintf(fdout,"%s%s\n",dash,symrec->cs_name) < 0)
 			return PERK_FILE_ERROR(dctx);
 
-		i += symtbl[i].cs_num_of_aux_recs[0];
-	}
-
 	return 0;
 }