Commit f9c14639 authored by Markus Armbruster's avatar Markus Armbruster Committed by Eric Blake
Browse files

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.

Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Message-Id: <20180211093607.27351-22-armbru@redhat.com>
Reviewed-by: default avatarMichael Roth <mdroth@linux.vnet.ibm.com>
Signed-off-by: default avatarEric Blake <eblake@redhat.com>
parent cdb6610a

scripts/qapi/common.py

+1 −1
Original line number Diff line number Diff line
@@ -1867,7 +1867,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):