[2/4] makedef: Fold as much text transformations as possible into the initial dump

Message ID 1503606746-21606-2-git-send-email-martin@martin.st
State Committed
Commit 44aa9105c535471ca9e23796d7ca29b341f47636
Headers show

Commit Message

Martin Storsjö Aug. 24, 2017, 8:32 p.m.
This avoids redoing them for each expression in the list.
---
 compat/windows/makedef | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Patch

diff --git a/compat/windows/makedef b/compat/windows/makedef
index fcaf108..b3de992 100755
--- a/compat/windows/makedef
+++ b/compat/windows/makedef
@@ -112,7 +112,10 @@  for line in $(cat ${vscript} | tr '\t' ' '); do
 '
 done
 
-dump=$(dumpbin -linkermember:1 ${libname})
+dump=$(dumpbin -linkermember:1 ${libname} |
+          sed -e '/public symbols/,$!d' -e '/^ \{1,\}Summary/,$d' -e "s/ \{1,\}${prefix}/ /" -e 's/ \{1,\}/ /g' |
+          tail -n +2 |
+          cut -d' ' -f3)
 
 rm ${libname}
 
@@ -121,9 +124,6 @@  list=""
 for exp in ${regex}; do
     list="${list}"'
 '$(echo "${dump}" |
-          sed -e '/public symbols/,$!d' -e '/^ \{1,\}Summary/,$d' -e "s/ \{1,\}${prefix}/ /" -e 's/ \{1,\}/ /g' |
-          tail -n +2 |
-          cut -d' ' -f3 |
           grep "^${exp}" |
           sed -e 's/^/    /')
 done