scripts/verify_log_statements.py: strip OSMO_STRINGIFY()

Change-Id: I439ee65cd65cf42e1005ca71aa7d4b680b18c0e5
This commit is contained in:
Neels Hofmeyr 2018-07-19 19:48:26 +02:00
parent 7ae9791c59
commit 6475204b4c
1 changed files with 2 additions and 0 deletions

View File

@ -21,6 +21,7 @@ import os.path
log_statement_re = re.compile(r'^[ \t]*LOG[_A-Z]+\(([^";,]*,)*[ \t\r\n]*(("[^"]*"[^";,]*)*)(,[^;]*|)\);',
re.MULTILINE | re.DOTALL)
fmt_re = re.compile(r'("[^"]*".*)*fmt')
osmo_stringify_re = re.compile("OSMO_STRINGIFY[_A-Z]*\([^)]*\)")
debug = ('-d' in sys.argv) or ('--debug' in sys.argv)
@ -79,6 +80,7 @@ def check_file(f):
for n in (16,32,64):
quoted = quoted.replace('PRIu' + str(n), '')
quoted = quoted.replace('PRId' + str(n), '')
quoted = ''.join(osmo_stringify_re.split(quoted))
# Use py eval to join separate string constants: drop any tabs/newlines
# that are not in quotes, between separate string constants.