From c18d107804dc94822997fb0069ae50745a92c573 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Fri, 9 Mar 2018 09:27:09 -0500 Subject: [PATCH] qapi/common: Fix guardname() for funny filenames guardname() fails to return a valid C identifier for arguments containing anything but [A-Za-z0-9_.-']. Fix that. Don't bother protecting ticklish identifiers; header guards are all-caps, and no ticklish identifiers are. Backports commit f9c146399dabefb8cd13c9c467a9e710af15ea70 from qemu --- qemu/scripts/qapi/common.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qemu/scripts/qapi/common.py b/qemu/scripts/qapi/common.py index 8dab62f5..6a3ea452 100644 --- a/qemu/scripts/qapi/common.py +++ b/qemu/scripts/qapi/common.py @@ -1876,7 +1876,7 @@ def mcgen(code, **kwds): def guardname(filename): - return c_name(filename, protect=False).upper() + return re.sub(r'[^A-Za-z0-9_]', '_', filename).upper() def guardstart(name):