mirrors
/
FreeRDP
mirror of https://github.com/FreeRDP/FreeRDP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed const cast warnings in generated settings setter

This commit is contained in:
Armin Novak 2021-10-07 09:16:20 +02:00 committed by akallabeth
parent e362a59aa5
commit cf74a6ea3f
2 changed files with 483 additions and 389 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

851
libfreerdp/common/settings_getters.c
View File

File diff suppressed because it is too large Load Diff

21
scripts/update-settings-tests
View File

@ -300,13 +300,13 @@ def write_getter(f, entry_dict, entry_type, entry_name):
def write_setter_case(f, val, isString, isPointer):
f.write('\t\tcase FreeRDP_' + val + ':\n')
if isPointer:
f.write('\t\t\tsettings->' + val + ' = (void*)val;\n')
f.write('\t\t\tsettings->' + val + ' = cnv.v;\n')
f.write('\t\t\tbreak;\n\n')
elif not isString:
f.write('\t\t\tsettings->' + val + ' = val;\n')
f.write('\t\t\tsettings->' + val + ' = cnv.c;\n')
f.write('\t\t\tbreak;\n\n')
else:
f.write('\t\t\treturn update_string(&settings->' + val + ', val, len, cleanup);\n\n')
f.write('\t\t\treturn update_string(&settings->' + val + ', cnv.cc, len, cleanup);\n\n')
def write_setter(f, entry_dict, entry_type, entry_name):
isString = 'string' in entry_name
@ -328,7 +328,22 @@ def write_setter(f, entry_dict, entry_type, entry_name):
else:
f.write(')\n')
f.write('{\n')
f.write('union\n')
f.write('{\n')
f.write(' void* v;\n')
f.write(' const void* cv;\n')
if not isPointer:
f.write(' ' + entry_type + ' c;\n')
f.write(' const ' + entry_type + ' cc;\n')
f.write('} cnv;\n')
f.write('\tWINPR_ASSERT(settings);\n\n')
if isPointer:
f.write('\tcnv.cv = val;\n\n')
elif isString:
f.write('\tcnv.cc = val;\n\n')
else:
f.write('\tcnv.c = val;\n\n')
f.write('\tswitch (id)\n')
f.write('\t{\n')
if values: