X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=generator%2Fnanopb_generator.py;h=066ef93650c355306df64dc954880cb0848a521f;hb=3a01eea8644576d47c2cc05ad3eac900d4b8e4f4;hp=36cbbdfa5e3bbda22d308231a52b3f293f3c9b90;hpb=ad6d66010ee072043c61a533730e0691def40061;p=apps%2Flow-level-can-service.git diff --git a/generator/nanopb_generator.py b/generator/nanopb_generator.py index 36cbbdf..066ef93 100755 --- a/generator/nanopb_generator.py +++ b/generator/nanopb_generator.py @@ -208,21 +208,21 @@ class Enum: result += '\n#define %s %s' % (self.value_longnames[i], x[0]) if self.options.enum_to_string: - result += '\nconst char *%s_Name(%s v);\n' % (self.names, self.names) + result += '\nconst char *%s_name(%s v);\n' % (self.names, self.names) return result - def enum_definition(self): + def enum_to_string_definition(self): if not self.options.enum_to_string: return "" - result = 'const char *%s_Name(%s v) {\n' % (self.names, self.names) + result = 'const char *%s_name(%s v) {\n' % (self.names, self.names) result += ' switch (v) {\n' for ((enumname, _), strname) in zip(self.values, self.value_longnames): # Strip off the leading type name from the string value. strval = str(strname)[len(str(self.names)) + 1:] - result += ' case %s: return "%s";\n' % (enumname, strval) + result += ' case %s: return "%s";\n' % (enumname, strval) result += ' }\n' result += ' return "unknown";\n' @@ -1242,7 +1242,7 @@ class ProtoFile: yield ext.extension_def() + '\n' for enum in self.enums: - yield enum.enum_definition() + '\n' + yield enum.enum_to_string_definition() + '\n' # Add checks for numeric limits if self.messages: