diff options
| -rw-r--r-- | hwdb/70-mouse.hwdb | 4 | ||||
| -rw-r--r-- | hwdb/70-pointingstick.hwdb | 2 | ||||
| -rw-r--r-- | src/core/selinux-setup.c | 1 | ||||
| -rw-r--r-- | src/libsystemd/sd-bus/bus-match.c | 2 | ||||
| -rw-r--r-- | src/locale/localed.c | 1 |
5 files changed, 7 insertions, 3 deletions
diff --git a/hwdb/70-mouse.hwdb b/hwdb/70-mouse.hwdb index 1e0a38e7f7..d198591010 100644 --- a/hwdb/70-mouse.hwdb +++ b/hwdb/70-mouse.hwdb @@ -257,8 +257,6 @@ mouse:usb:v046dp1025:name:Logitech M510: # Logitech M705 (marathon mouse) mouse:usb:v046dp101b:name:Logitech M705: mouse:usb:v046dpc52b:name:Logitech Unifying Device. Wireless PID:101b: -# Logitech Performance MX -mouse:usb:v046dp101a:name:Logitech Performance MX: MOUSE_DPI=800@166 # Logitech MX Revolution @@ -303,6 +301,8 @@ mouse:usb:v046dpc065:name:Logitech USB Laser Mouse: mouse:usb:v046dpc510:name:Logitech USB Receiver: MOUSE_DPI=1000@125 +# Logitech Performance MX +mouse:usb:v046dp101a:name:Logitech Performance MX: # Logitech MX Master mouse:usb:v046dp4041:name:Logitech MX Master: MOUSE_DPI=1000@166 diff --git a/hwdb/70-pointingstick.hwdb b/hwdb/70-pointingstick.hwdb index 775ec7fea5..b36c897bd6 100644 --- a/hwdb/70-pointingstick.hwdb +++ b/hwdb/70-pointingstick.hwdb @@ -88,6 +88,8 @@ evdev:name:*DualPoint Stick:dmi:bvn*:bvr*:bd*:svnDellInc.:pnLatitudeE6400*:pvr* # Lenovo ######################################### +# Lenovo Thinkpad X230 +evdev:name:TPPS/2 IBM TrackPoint:dmi:bvn*:bvr*:bd*:svnLENOVO:pn*:pvrThinkPadX230:* # Lenovo Thinkpad X230 tablet evdev:name:TPPS/2 IBM TrackPoint:dmi:bvn*:bvr*:bd*:svnLENOVO:pn*:pvrThinkPadX230Tablet:* # Lenovo Thinkpad X240 diff --git a/src/core/selinux-setup.c b/src/core/selinux-setup.c index a4678500e6..e5b457643b 100644 --- a/src/core/selinux-setup.c +++ b/src/core/selinux-setup.c @@ -34,6 +34,7 @@ #include "log.h" #ifdef HAVE_SELINUX +_printf_(2,3) static int null_log(int type, const char *fmt, ...) { return 0; } diff --git a/src/libsystemd/sd-bus/bus-match.c b/src/libsystemd/sd-bus/bus-match.c index 2b83f439a7..7234e7926a 100644 --- a/src/libsystemd/sd-bus/bus-match.c +++ b/src/libsystemd/sd-bus/bus-match.c @@ -932,7 +932,7 @@ fail: } char *bus_match_to_string(struct bus_match_component *components, unsigned n_components) { - _cleanup_free_ FILE *f = NULL; + _cleanup_fclose_ FILE *f = NULL; char *buffer = NULL; size_t size = 0; unsigned i; diff --git a/src/locale/localed.c b/src/locale/localed.c index e9489f04c2..4fa84df8c0 100644 --- a/src/locale/localed.c +++ b/src/locale/localed.c @@ -1092,6 +1092,7 @@ static int method_set_vc_keyboard(sd_bus_message *m, void *userdata, sd_bus_erro } #ifdef HAVE_XKBCOMMON +_printf_(3, 0) static void log_xkb(struct xkb_context *ctx, enum xkb_log_level lvl, const char *format, va_list args) { const char *fmt; |