inline some typedefs

Change-Id: I1608e03ff9f6fbc55987010e88897e034b690b3a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115552
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

1 files changed, 10 insertions, 8 deletions

diff --git a/bin/find-unused-typedefs.py b/bin/find-unused-typedefs.py
index 9a6c0eef9118..0fd96749c300 100755
--- a/bin/find-unused-typedefs.py
+++ b/bin/find-unused-typedefs.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/python3
 
 import subprocess
 
@@ -9,26 +9,28 @@ a = subprocess.Popen("git grep -P 'typedef\\s+.+\\s+\\w+;' -- \"[!e][!x][!t]*\""
 typedefSet = set()
 with a.stdout as txt:
     for line in txt:
-        idx2 = line.rfind(";")
-        idx1 = line.rfind(" ", 0, idx2)
+        idx2 = line.rfind(b";")
+        idx1 = line.rfind(b" ", 0, idx2)
         typedefName = line[idx1+1 : idx2]
-        if typedefName.startswith("*"):
+        if typedefName.startswith(b"*"):
            typedefName = typedefName[1:]
         # ignore anything less than 5 characters, it's probably a parsing error
         if len(typedefName) < 5: continue
         typedefSet.add(typedefName)
 
 for typedefName in sorted(typedefSet):
-    print("checking: " + typedefName)
+    print(b"checking: " + typedefName)
     a = subprocess.Popen(["git", "grep", "-wn", typedefName], stdout=subprocess.PIPE)
-    foundLine2 = ""
+    foundLine2 = b""
     cnt = 0
     with a.stdout as txt2:
         for line2 in txt2:
             cnt = cnt + 1
             foundLine2 += line2
+            if cnt > 2: break
+    a.kill()
     if cnt == 1:
-        print("remove: " + foundLine2)
+        print(b"remove: " + foundLine2)
     elif cnt == 2:
-        print("inline: " + foundLine2)
+        print(b"inline: " + foundLine2)