From: Ján Tomko <jtomko@redhat.com>
Date: Wed, 20 Nov 2019 18:05:13 +0000 (+0100)
Subject: scripts: check-aclrules: use in instead of find
X-Git-Tag: v5.10.0-rc1~39
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=988f02a99c6166b8dcc70f9a6b162a3ad285fa13;p=thirdparty%2Flibvirt.git

scripts: check-aclrules: use in instead of find

For checking whether a substring is present in a string,
using the pattern:
    "str" in string
is slightly faster than:
    string.find("str") != -1

Use it to shave off 4 % of the runtime of this script that
processes quite a few long source files.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Reviewed-by: Erik Skultety <eskultet@redhat.com>
---

diff --git a/scripts/check-aclrules.py b/scripts/check-aclrules.py
index e06a019b00..d145e59164 100755
--- a/scripts/check-aclrules.py
+++ b/scripts/check-aclrules.py
@@ -97,7 +97,7 @@ def fixup_name(name):
 
 def name_to_ProcName(name):
     elems = []
-    if name.find("_") != -1 or name.lower() in ["open", "close"]:
+    if "_" in name or name.lower() in ["open", "close"]:
         elems = [n.lower().capitalize() for n in name.split("_")]
     else:
         elems = [name]
@@ -116,11 +116,11 @@ with open(proto, "r") as fh:
     filtered = False
 
     for line in fh:
-        if line.find("/**") != -1:
+        if "/**" in line:
             incomment = True
             filtered = False
         elif incomment:
-            if line.find("* @aclfilter") != -1:
+            if "* @aclfilter" in line:
                 filtered = True
             elif filtered:
                 m = re.search(r'''REMOTE_PROC_(.*)\s+=\s*\d+''', line)
@@ -211,7 +211,7 @@ def process_file(filename):
             # an ACL function
             if intable:
                 assign = re.search(r'''\.(\w+)\s*=\s*(\w+),?''', line)
-                if line.find("}") != -1:
+                if "}" in line:
                     intable = False
                     table = None
                 elif assign is not None:
@@ -247,9 +247,9 @@ def process_file(filename):
                         intable = True
                         table = name
 
-            if line.find("{") != -1:
+            if "{" in line:
                 brace = brace + 1
-            if line.find("}") != -1:
+            if "}" in line:
                 brace = brace - 1
 
     return errs