Merge pull request #374 from lool/simplify-get-rawprogram

refactor(get-rawprogram-fix): Misc cleanups

Author: lool

scripts/get-rawprogram-filename.py

@@ -2,8 +2,11 @@
 # Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
 # SPDX-License-Identifier: BSD-3-Clause
 #
-# Print the filename attribute of a <program> element by label from a
-# rawprogram XML file generated by qcom-ptool.
+# Parse a rawprogram XML file generated by qcom-ptool. Search for first
+# <program> element with provided label. Print its filename attribute,
+# stripped of a leading "../" if present.
+#
+# Returns "none" if no such element found.
 #
 # Usage:  get-rawprogram-filename.py <label> <rawprogram0.xml>
 #
@@ -16,17 +19,18 @@
 
 if len(sys.argv) != 3:
     print(f"Usage: {sys.argv[0]} <label> <rawprogram0.xml>", file=sys.stderr)
+    sys.exit(1)
+
+label, xml_file = sys.argv[1], sys.argv[2]
+
+root = ET.parse(xml_file).getroot()
+e = root.find(f".//program[@label='{label}']")
+if e is None:
     print("none")
-else:
-    label, xml_file = sys.argv[1], sys.argv[2]
+    sys.exit(0)
 
-    root = ET.parse(xml_file).getroot()
-    e = root.find(f".//program[@label='{label}']")
-    if e is None:
-        print("none")
-    else:
-        filename = e.get("filename")
-        # Strip any leading ../ path components
-        while filename.startswith("../"):
-            filename = filename[3:]
-        print(filename)
+filename = e.get("filename")
+# Strip any leading ../ path components
+while filename.startswith("../"):
+    filename = filename[3:]
+print(filename)