Fix makeconstants.py

berko-claroty · berko-claroty · commit e75cad39bdcc · 2026-05-18T15:19:46.000+03:00
run with python3
changed headers due to changes in NM packaging
diff --git a/makeconstants.py b/makeconstants.py
@@ -3,12 +3,19 @@
 
 import re
 
-enum_regex = re.compile(r'typedef enum(?:\s+[a-zA-Z]+)?\s*\{(.*?)\}', re.DOTALL)
+enum_regex = re.compile(r'typedef enum[^{]*\{(.*?)\}', re.DOTALL)
 comment_regex = re.compile(r'/\*.*?\*/', re.DOTALL)
+suffix_regex = re.compile(r'[uUlL]+$')
+
+def parse_c_value(val, constants):
+    val = suffix_regex.sub('', val.strip())
+    return eval(val, constants)
+
 headers = [ '/usr/include/libnm/nm-dbus-interface.h',
-           '/usr/include/NetworkManager/NetworkManagerVPN.h',
-           '/usr/include/libnm-glib/nm-secret-agent.h']
+           '/usr/include/libnm/nm-vpn-dbus-interface.h',
+           '/usr/include/libnm/nm-secret-agent-old.h']
 
+constants = {}
 for h in headers:
     for enum in enum_regex.findall(open(h).read()):
         enum = comment_regex.sub('', enum)
@@ -17,10 +24,11 @@
             if not key.strip():
                 continue
             if '=' in key:
-                key, val = key.split('=')
-                val = eval(val.replace('LL',''))
+                key, val = key.split('=', 1)
+                val = parse_c_value(val, constants)
             else:
                 val = last + 1
             key = key.strip()
             print('%s = %d' % (key, val))
+            constants[key] = val
             last = val
