From 6475204b4ca6fd77fbeaa1d1be07d3bcefc518bc Mon Sep 17 00:00:00 2001 From: Neels Hofmeyr Date: Thu, 19 Jul 2018 19:48:26 +0200 Subject: [PATCH] scripts/verify_log_statements.py: strip OSMO_STRINGIFY() Change-Id: I439ee65cd65cf42e1005ca71aa7d4b680b18c0e5 --- scripts/verify_log_statements.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/verify_log_statements.py b/scripts/verify_log_statements.py index 6108c230..567a96ab 100755 --- a/scripts/verify_log_statements.py +++ b/scripts/verify_log_statements.py @@ -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.