diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2024-06-07 11:12:45 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2024-06-07 11:14:17 +1000 |
| commit | 74335c6fd697a60976d52786598a7dd4ba17405a (patch) | |
| tree | 405092f47f3ee7d188e5e47033f69b8cc900686e | |
| parent | b791b30b1f384d327c001cfb821ed34b2c2174a5 (diff) | |
Revert "fix int type mismatches in printf()-like calls"
This now warns on 64-bit machines:
../src/xf86libinput.c:542:61: warning: format ‘%lu’ expects argument
of type ‘long unsigned int’, but argument 4 has type ‘CARD32’ {aka ‘unsigned int’} [-Wformat=]
Given they vastly outnumber 32-bit machines now, let's go back to the
old one that only warns on 32 bit until we fix the actual source types
to use uint32_t and similar.
This reverts commit a7d299425602dc7d8d6baffb8d483c37855e4281.
| -rw-r--r-- | src/xf86libinput.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/xf86libinput.c b/src/xf86libinput.c index c23e437..91af896 100644 --- a/src/xf86libinput.c +++ b/src/xf86libinput.c @@ -517,7 +517,7 @@ LibinputApplyConfigSendEvents(DeviceIntPtr dev, libinput_device_config_send_events_set_mode(device, driver_data->options.sendevents) != LIBINPUT_CONFIG_STATUS_SUCCESS) xf86IDrvMsg(pInfo, X_ERROR, - "Failed to set SendEventsMode %lu\n", + "Failed to set SendEventsMode %u\n", driver_data->options.sendevents); } @@ -792,7 +792,7 @@ LibinputApplyConfigScrollMethod(DeviceIntPtr dev, scroll_button = btn_xorg2linux(driver_data->options.scroll_button); if (libinput_device_config_scroll_set_button(device, scroll_button) != LIBINPUT_CONFIG_STATUS_SUCCESS) xf86IDrvMsg(pInfo, X_ERROR, - "Failed to set ScrollButton to %lu\n", + "Failed to set ScrollButton to %u\n", driver_data->options.scroll_button); } @@ -3245,7 +3245,7 @@ xf86libinput_parse_scrollbutton_option(InputInfoPtr pInfo, if (libinput_device_config_scroll_set_button(device, b) != LIBINPUT_CONFIG_STATUS_SUCCESS) { xf86IDrvMsg(pInfo, X_ERROR, - "Failed to set ScrollButton to %lu\n", + "Failed to set ScrollButton to %u\n", scroll_button); scroll_button = btn_linux2xorg(libinput_device_config_scroll_get_button(device)); } @@ -4224,7 +4224,7 @@ xf86libinput_check_device(DeviceIntPtr dev, if (dev->public.on) xf86IDrvMsg(pInfo, X_WARNING, "BUG: xf86libinput_check_device() device is on\n"); xf86IDrvMsg(pInfo, X_INFO, - "SetProperty on %lu called but device is disabled.\n" + "SetProperty on %u called but device is disabled.\n" "This driver cannot change properties on a disabled device\n", atom); return FALSE; |