XLibre/xf86-input-libinput
1
0
Fork 0
mirror of https://github.com/X11Libre/xf86-input-libinput.git synced 2026-03-24 01:24:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "fix int type mismatches in printf()-like calls"

Browse Source 
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 a7d2994256.
This commit is contained in:
Peter Hutterer
2024-06-07 11:12:45 +10:00
parent b791b30b1f
commit 74335c6fd6
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/xf86libinput.c
View File

@@ -517,7 +517,7 @@ LibinputApplyConfigSendEvents(DeviceIntPtr dev,
libinput_device_config_send_events_set_mode(device, libinput_device_config_send_events_set_mode(device,
driver_data->options.sendevents) != LIBINPUT_CONFIG_STATUS_SUCCESS) driver_data->options.sendevents) != LIBINPUT_CONFIG_STATUS_SUCCESS)
xf86IDrvMsg(pInfo, X_ERROR, xf86IDrvMsg(pInfo, X_ERROR,
"Failed to set SendEventsMode %lu\n", "Failed to set SendEventsMode %u\n",
driver_data->options.sendevents); driver_data->options.sendevents);
} }
@@ -792,7 +792,7 @@ LibinputApplyConfigScrollMethod(DeviceIntPtr dev,
scroll_button = btn_xorg2linux(driver_data->options.scroll_button); scroll_button = btn_xorg2linux(driver_data->options.scroll_button);
if (libinput_device_config_scroll_set_button(device, scroll_button) != LIBINPUT_CONFIG_STATUS_SUCCESS) if (libinput_device_config_scroll_set_button(device, scroll_button) != LIBINPUT_CONFIG_STATUS_SUCCESS)
xf86IDrvMsg(pInfo, X_ERROR, xf86IDrvMsg(pInfo, X_ERROR,
"Failed to set ScrollButton to %lu\n", "Failed to set ScrollButton to %u\n",
driver_data->options.scroll_button); driver_data->options.scroll_button);
} }
@@ -3245,7 +3245,7 @@ xf86libinput_parse_scrollbutton_option(InputInfoPtr pInfo,
if (libinput_device_config_scroll_set_button(device, if (libinput_device_config_scroll_set_button(device,
b) != LIBINPUT_CONFIG_STATUS_SUCCESS) { b) != LIBINPUT_CONFIG_STATUS_SUCCESS) {
xf86IDrvMsg(pInfo, X_ERROR, xf86IDrvMsg(pInfo, X_ERROR,
"Failed to set ScrollButton to %lu\n", "Failed to set ScrollButton to %u\n",
scroll_button); scroll_button);
scroll_button = btn_linux2xorg(libinput_device_config_scroll_get_button(device)); scroll_button = btn_linux2xorg(libinput_device_config_scroll_get_button(device));
} }
@@ -4224,7 +4224,7 @@ xf86libinput_check_device(DeviceIntPtr dev,
if (dev->public.on) if (dev->public.on)
xf86IDrvMsg(pInfo, X_WARNING, "BUG: xf86libinput_check_device() device is on\n"); xf86IDrvMsg(pInfo, X_WARNING, "BUG: xf86libinput_check_device() device is on\n");
xf86IDrvMsg(pInfo, X_INFO, 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", "This driver cannot change properties on a disabled device\n",
atom); atom);
return FALSE; return FALSE;