pxcloud/spice-common
5
0
Fork 0
mirror of https://gitlab.uni-freiburg.de/opensourcevdi/spice-common synced 2026-01-01 04:11:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

codegen: Rename --prefix parameter to --suffix

Browse Source 
The option is used to add a suffix to public functions, not a
prefix.
Currently the option is not used (it was used to generate protocol
1 code).

Signed-off-by: Frediano Ziglio <fziglio@redhat.com>
Acked-by: Christophe Fergeau <cfergeau@redhat.com>
This commit is contained in:
Frediano Ziglio 2019-03-03 18:49:22 +00:00
parent 302e30ff43
commit cb00ccfaab
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
python_modules/codegen.py
View File

@ -117,7 +117,7 @@ class CodeWriter:
writer.index_type = self.index_type
writer.generated = self.generated
writer.options = self.options
writer.public_prefix = self.public_prefix
writer.public_suffix = self.public_suffix
return writer

10
python_modules/demarshal.py
View File

@ -1136,9 +1136,9 @@ def write_channel_parser(writer, channel, server):
def write_get_channel_parser(writer, channel_parsers, max_channel, is_server):
writer.newline()
if is_server:
function_name = "spice_get_server_channel_parser" + writer.public_prefix
function_name = "spice_get_server_channel_parser" + writer.public_suffix
else:
function_name = "spice_get_client_channel_parser" + writer.public_prefix
function_name = "spice_get_client_channel_parser" + writer.public_suffix
scope = writer.function(function_name,
"spice_parse_channel_func_t",
@ -1195,15 +1195,15 @@ def write_full_protocol_parser(writer, is_server):
function_name = "spice_parse_msg"
else:
function_name = "spice_parse_reply"
scope = writer.function(function_name + writer.public_prefix,
scope = writer.function(function_name + writer.public_suffix,
"uint8_t *",
"uint8_t *message_start, uint8_t *message_end, uint32_t channel, uint16_t message_type, SPICE_GNUC_UNUSED int minor, size_t *size_out, message_destructor_t *free_message")
scope.variable_def("spice_parse_channel_func_t", "func" )
if is_server:
writer.assign("func", "spice_get_server_channel_parser%s(channel, NULL)" % writer.public_prefix)
writer.assign("func", "spice_get_server_channel_parser%s(channel, NULL)" % writer.public_suffix)
else:
writer.assign("func", "spice_get_client_channel_parser%s(channel, NULL)" % writer.public_prefix)
writer.assign("func", "spice_get_client_channel_parser%s(channel, NULL)" % writer.public_suffix)
with writer.if_block("func != NULL"):
writer.statement("return func(message_start, message_end, message_type, minor, size_out, free_message)")

4
python_modules/marshal.py
View File

@ -412,10 +412,10 @@ def write_protocol_marshaller(writer, proto, is_server, private_marshallers):
writer.header.end_block(newline=False)
writer.header.writeln(" SpiceMessageMarshallers;")
writer.header.newline()
writer.header.statement("SpiceMessageMarshallers *spice_message_marshallers_get" + writer.public_prefix+"(void)")
writer.header.statement("SpiceMessageMarshallers *spice_message_marshallers_get" + writer.public_suffix+"(void)")
writer.header.newline()
scope = writer.function("spice_message_marshallers_get" + writer.public_prefix,
scope = writer.function("spice_message_marshallers_get" + writer.public_suffix,
"SpiceMessageMarshallers *",
"void")
writer.writeln("static SpiceMessageMarshallers marshallers = {NULL};").newline()

6
spice_codegen.py
View File

@ -145,8 +145,8 @@ parser.add_option("-k", "--keep-identical-file",
parser.add_option("-i", "--include",
action="append", dest="includes", metavar="FILE",
help="Include FILE in generated code")
parser.add_option("--prefix", dest="prefix",
help="set public symbol prefix", default="")
parser.add_option("--suffix", dest="suffix",
help="set public symbol suffix", default="")
parser.add_option("--license", dest="license",
help="license to use for generated file(s) (LGPL/BSD)", default="LGPL")
@ -226,7 +226,7 @@ else:
print >> sys.stderr, "Invalid license specified: %s" % options.license
sys.exit(1)
writer.public_prefix = options.prefix
writer.public_suffix = options.suffix
writer.writeln("/* this is a file autogenerated by spice_codegen.py */")
writer.write(license)