From 2a41b3d20509b73e1f85adf27557d6062c819801 Mon Sep 17 00:00:00 2001 From: akallabeth Date: Fri, 16 Jan 2026 11:38:26 +0100 Subject: [PATCH] [tools,settings] update settings generator * Fix format string violations in generator * Update generated files --- libfreerdp/common/settings_getters.c | 60 ++++++++++------------------ tools/update-settings-tests | 4 +- 2 files changed, 22 insertions(+), 42 deletions(-) diff --git a/libfreerdp/common/settings_getters.c b/libfreerdp/common/settings_getters.c index 5a5ba0969..102fda28f 100644 --- a/libfreerdp/common/settings_getters.c +++ b/libfreerdp/common/settings_getters.c @@ -644,8 +644,7 @@ BOOL freerdp_settings_get_bool(WINPR_ATTR_UNUSED const rdpSettings* settings, return settings->Workarea; default: - WLog_ERR(TAG, "Invalid key index %" PRIuz " [%s|%s]", id, - freerdp_settings_get_name_for_key(id), + WLog_ERR(TAG, "Invalid key index %d [%s|%s]", id, freerdp_settings_get_name_for_key(id), freerdp_settings_get_type_name_for_key(id)); WINPR_ASSERT(FALSE); return FALSE; @@ -1449,8 +1448,7 @@ BOOL freerdp_settings_set_bool(WINPR_ATTR_UNUSED rdpSettings* settings, break; default: - WLog_ERR(TAG, "Invalid key index %" PRIuz " [%s|%s]", id, - freerdp_settings_get_name_for_key(id), + WLog_ERR(TAG, "Invalid key index %d [%s|%s]", id, freerdp_settings_get_name_for_key(id), freerdp_settings_get_type_name_for_key(id)); return FALSE; } @@ -1504,8 +1502,7 @@ UINT16 freerdp_settings_get_uint16(WINPR_ATTR_UNUSED const rdpSettings* settings return settings->TextANSICodePage; default: - WLog_ERR(TAG, "Invalid key index %" PRIuz " [%s|%s]", id, - freerdp_settings_get_name_for_key(id), + WLog_ERR(TAG, "Invalid key index %d [%s|%s]", id, freerdp_settings_get_name_for_key(id), freerdp_settings_get_type_name_for_key(id)); WINPR_ASSERT(FALSE); return 0; @@ -1581,8 +1578,7 @@ BOOL freerdp_settings_set_uint16(WINPR_ATTR_UNUSED rdpSettings* settings, break; default: - WLog_ERR(TAG, "Invalid key index %" PRIuz " [%s|%s]", id, - freerdp_settings_get_name_for_key(id), + WLog_ERR(TAG, "Invalid key index %d [%s|%s]", id, freerdp_settings_get_name_for_key(id), freerdp_settings_get_type_name_for_key(id)); return FALSE; } @@ -1597,8 +1593,7 @@ INT16 freerdp_settings_get_int16(WINPR_ATTR_UNUSED const rdpSettings* settings, switch (id) { default: - WLog_ERR(TAG, "Invalid key index %" PRIuz " [%s|%s]", id, - freerdp_settings_get_name_for_key(id), + WLog_ERR(TAG, "Invalid key index %d [%s|%s]", id, freerdp_settings_get_name_for_key(id), freerdp_settings_get_type_name_for_key(id)); WINPR_ASSERT(FALSE); return 0; @@ -1622,8 +1617,7 @@ BOOL freerdp_settings_set_int16(WINPR_ATTR_UNUSED rdpSettings* settings, switch (id) { default: - WLog_ERR(TAG, "Invalid key index %" PRIuz " [%s|%s]", id, - freerdp_settings_get_name_for_key(id), + WLog_ERR(TAG, "Invalid key index %d [%s|%s]", id, freerdp_settings_get_name_for_key(id), freerdp_settings_get_type_name_for_key(id)); return FALSE; } @@ -2020,8 +2014,7 @@ UINT32 freerdp_settings_get_uint32(WINPR_ATTR_UNUSED const rdpSettings* settings #endif default: - WLog_ERR(TAG, "Invalid key index %" PRIuz " [%s|%s]", id, - freerdp_settings_get_name_for_key(id), + WLog_ERR(TAG, "Invalid key index %d [%s|%s]", id, freerdp_settings_get_name_for_key(id), freerdp_settings_get_type_name_for_key(id)); WINPR_ASSERT(FALSE); return 0; @@ -2553,8 +2546,7 @@ BOOL freerdp_settings_set_uint32(WINPR_ATTR_UNUSED rdpSettings* settings, #endif default: - WLog_ERR(TAG, "Invalid key index %" PRIuz " [%s|%s]", id, - freerdp_settings_get_name_for_key(id), + WLog_ERR(TAG, "Invalid key index %d [%s|%s]", id, freerdp_settings_get_name_for_key(id), freerdp_settings_get_type_name_for_key(id)); return FALSE; } @@ -2581,8 +2573,7 @@ INT32 freerdp_settings_get_int32(WINPR_ATTR_UNUSED const rdpSettings* settings, return settings->YPan; default: - WLog_ERR(TAG, "Invalid key index %" PRIuz " [%s|%s]", id, - freerdp_settings_get_name_for_key(id), + WLog_ERR(TAG, "Invalid key index %d [%s|%s]", id, freerdp_settings_get_name_for_key(id), freerdp_settings_get_type_name_for_key(id)); WINPR_ASSERT(FALSE); return 0; @@ -2622,8 +2613,7 @@ BOOL freerdp_settings_set_int32(WINPR_ATTR_UNUSED rdpSettings* settings, break; default: - WLog_ERR(TAG, "Invalid key index %" PRIuz " [%s|%s]", id, - freerdp_settings_get_name_for_key(id), + WLog_ERR(TAG, "Invalid key index %d [%s|%s]", id, freerdp_settings_get_name_for_key(id), freerdp_settings_get_type_name_for_key(id)); return FALSE; } @@ -2644,8 +2634,7 @@ UINT64 freerdp_settings_get_uint64(WINPR_ATTR_UNUSED const rdpSettings* settings return settings->ParentWindowId; default: - WLog_ERR(TAG, "Invalid key index %" PRIuz " [%s|%s]", id, - freerdp_settings_get_name_for_key(id), + WLog_ERR(TAG, "Invalid key index %d [%s|%s]", id, freerdp_settings_get_name_for_key(id), freerdp_settings_get_type_name_for_key(id)); WINPR_ASSERT(FALSE); return 0; @@ -2677,8 +2666,7 @@ BOOL freerdp_settings_set_uint64(WINPR_ATTR_UNUSED rdpSettings* settings, break; default: - WLog_ERR(TAG, "Invalid key index %" PRIuz " [%s|%s]", id, - freerdp_settings_get_name_for_key(id), + WLog_ERR(TAG, "Invalid key index %d [%s|%s]", id, freerdp_settings_get_name_for_key(id), freerdp_settings_get_type_name_for_key(id)); return FALSE; } @@ -2693,8 +2681,7 @@ INT64 freerdp_settings_get_int64(WINPR_ATTR_UNUSED const rdpSettings* settings, switch (id) { default: - WLog_ERR(TAG, "Invalid key index %" PRIuz " [%s|%s]", id, - freerdp_settings_get_name_for_key(id), + WLog_ERR(TAG, "Invalid key index %d [%s|%s]", id, freerdp_settings_get_name_for_key(id), freerdp_settings_get_type_name_for_key(id)); WINPR_ASSERT(FALSE); return 0; @@ -2718,8 +2705,7 @@ BOOL freerdp_settings_set_int64(WINPR_ATTR_UNUSED rdpSettings* settings, switch (id) { default: - WLog_ERR(TAG, "Invalid key index %" PRIuz " [%s|%s]", id, - freerdp_settings_get_name_for_key(id), + WLog_ERR(TAG, "Invalid key index %d [%s|%s]", id, freerdp_settings_get_name_for_key(id), freerdp_settings_get_type_name_for_key(id)); return FALSE; } @@ -3052,8 +3038,7 @@ const char* freerdp_settings_get_string(WINPR_ATTR_UNUSED const rdpSettings* set return settings->WmClass; default: - WLog_ERR(TAG, "Invalid key index %" PRIuz " [%s|%s]", id, - freerdp_settings_get_name_for_key(id), + WLog_ERR(TAG, "Invalid key index %d [%s|%s]", id, freerdp_settings_get_name_for_key(id), freerdp_settings_get_type_name_for_key(id)); WINPR_ASSERT(FALSE); return NULL; @@ -3385,8 +3370,7 @@ char* freerdp_settings_get_string_writable(rdpSettings* settings, FreeRDP_Settin return settings->WmClass; default: - WLog_ERR(TAG, "Invalid key index %" PRIuz " [%s|%s]", id, - freerdp_settings_get_name_for_key(id), + WLog_ERR(TAG, "Invalid key index %d [%s|%s]", id, freerdp_settings_get_name_for_key(id), freerdp_settings_get_type_name_for_key(id)); WINPR_ASSERT(FALSE); return NULL; @@ -3729,8 +3713,7 @@ BOOL freerdp_settings_set_string_(WINPR_ATTR_UNUSED rdpSettings* settings, return update_string_(&settings->WmClass, cnv.c, len); default: - WLog_ERR(TAG, "Invalid key index %" PRIuz " [%s|%s]", id, - freerdp_settings_get_name_for_key(id), + WLog_ERR(TAG, "Invalid key index %d [%s|%s]", id, freerdp_settings_get_name_for_key(id), freerdp_settings_get_type_name_for_key(id)); return FALSE; } @@ -4095,8 +4078,7 @@ BOOL freerdp_settings_set_string_copy_(WINPR_ATTR_UNUSED rdpSettings* settings, return update_string_copy_(&settings->WmClass, cnv.cc, len, cleanup); default: - WLog_ERR(TAG, "Invalid key index %" PRIuz " [%s|%s]", id, - freerdp_settings_get_name_for_key(id), + WLog_ERR(TAG, "Invalid key index %d [%s|%s]", id, freerdp_settings_get_name_for_key(id), freerdp_settings_get_type_name_for_key(id)); return FALSE; } @@ -4203,8 +4185,7 @@ void* freerdp_settings_get_pointer_writable(rdpSettings* settings, FreeRDP_Setti return settings->instance; default: - WLog_ERR(TAG, "Invalid key index %" PRIuz " [%s|%s]", id, - freerdp_settings_get_name_for_key(id), + WLog_ERR(TAG, "Invalid key index %d [%s|%s]", id, freerdp_settings_get_name_for_key(id), freerdp_settings_get_type_name_for_key(id)); WINPR_ASSERT(FALSE); return NULL; @@ -4351,8 +4332,7 @@ BOOL freerdp_settings_set_pointer(WINPR_ATTR_UNUSED rdpSettings* settings, break; default: - WLog_ERR(TAG, "Invalid key index %" PRIuz " [%s|%s]", id, - freerdp_settings_get_name_for_key(id), + WLog_ERR(TAG, "Invalid key index %d [%s|%s]", id, freerdp_settings_get_name_for_key(id), freerdp_settings_get_type_name_for_key(id)); return FALSE; } diff --git a/tools/update-settings-tests b/tools/update-settings-tests index dcf96d8f5..5ec44de4a 100755 --- a/tools/update-settings-tests +++ b/tools/update-settings-tests @@ -109,7 +109,7 @@ def write_getter_body(f, values, ret, keys, isPointer, compat_values, typestr, e write_getter_case(f, val, cast, typestr) f.write('#endif\n') f.write('\t\tdefault:\n') - f.write('\t\t\tWLog_ERR(TAG, "Invalid key index %" PRIuz " [%s|%s]", id, freerdp_settings_get_name_for_key(id), freerdp_settings_get_type_name_for_key(id));\n') + f.write('\t\t\tWLog_ERR(TAG, "Invalid key index %d [%s|%s]", id, freerdp_settings_get_name_for_key(id), freerdp_settings_get_type_name_for_key(id));\n') f.write('\t\t\tWINPR_ASSERT(FALSE);\n') f.write('\t\t\treturn ' + ret + ';\n') f.write('\t}\n') @@ -226,7 +226,7 @@ def write_setter(f, entry_dict, entry_type, entry_name, postfix, compat_dict): write_setter_case(f, val, postfix, isPointer, cast) f.write('#endif\n') f.write('\t\tdefault:\n') - f.write('\t\t\tWLog_ERR(TAG, "Invalid key index %" PRIuz " [%s|%s]", id, freerdp_settings_get_name_for_key(id), freerdp_settings_get_type_name_for_key(id));\n') + f.write('\t\t\tWLog_ERR(TAG, "Invalid key index %d [%s|%s]", id, freerdp_settings_get_name_for_key(id), freerdp_settings_get_type_name_for_key(id));\n') f.write('\t\t\treturn FALSE;\n') f.write('\t}\n') f.write('\treturn TRUE;\n')