Sanitize filenames before putting them in #ifndef.
Update issue 50 Status: FixedInGit
This commit is contained in:
@@ -452,6 +452,16 @@ def sort_dependencies(messages):
|
||||
if msgname in message_by_name:
|
||||
yield message_by_name[msgname]
|
||||
|
||||
def make_identifier(headername):
|
||||
'''Make #ifndef identifier that contains uppercase A-Z and digits 0-9'''
|
||||
result = ""
|
||||
for c in headername.upper():
|
||||
if c.isalnum():
|
||||
result += c
|
||||
else:
|
||||
result += '_'
|
||||
return result
|
||||
|
||||
def generate_header(dependencies, headername, enums, messages):
|
||||
'''Generate content for a header file.
|
||||
Generates strings, which should be concatenated and stored to file.
|
||||
@@ -460,7 +470,7 @@ def generate_header(dependencies, headername, enums, messages):
|
||||
yield '/* Automatically generated nanopb header */\n'
|
||||
yield '/* Generated by %s at %s. */\n\n' % (nanopb_version, time.asctime())
|
||||
|
||||
symbol = headername.replace('.', '_').upper()
|
||||
symbol = make_identifier(headername)
|
||||
yield '#ifndef _PB_%s_\n' % symbol
|
||||
yield '#define _PB_%s_\n' % symbol
|
||||
yield '#include <pb.h>\n\n'
|
||||
|
||||
Reference in New Issue
Block a user