Merge 2c10349b6b into b7eefa1996

hwdb: Add quirk for Logitech MX Keys for Mac
The KEY_102ND and KEY_GRAVE keys are switched on the Logitech MX Keys for Mac, so switch them back
2024-11-21 14:37:10 +01:00 · 2024-11-21 14:37:07 +01:00 · 2024-11-21 14:02:34 +09:00
2 changed files with 4 additions and 4 deletions
--- a/hwdb.d/60-keyboard.hwdb
+++ b/hwdb.d/60-keyboard.hwdb
@ -1440,8 +1440,8 @@ evdev:input:b0003v046DpC309*

 # Logitech MX Keys for Mac
 evdev:input:b0003v046Dp4092*
- KEYBOARD_KEY_70035=102nd
- KEYBOARD_KEY_70064=grave
+ KEYBOARD_KEY_70035=102nd                               # '<' key
+ KEYBOARD_KEY_70064=grave                               # '^' key

 ###########################################################
 # Maxdata
--- a/src/basic/cgroup-util.c
+++ b/src/basic/cgroup-util.c
@ -799,7 +799,7 @@ int cg_pid_get_path(const char *controller, pid_t pid, char **ret_path) {
                                continue;
                }

-                char *path = strdup(e + 1);
+                _cleanup_free_ char *path = strdup(e + 1);
                if (!path)
                        return -ENOMEM;

@ -812,7 +812,7 @@ int cg_pid_get_path(const char *controller, pid_t pid, char **ret_path) {
                if (e)
                        *e = 0;

-                *ret_path = path;
+                *ret_path = TAKE_PTR(path);
                return 0;
        }
 }
Author	SHA1	Message	Date
Tobias Zimmermann	c272c4b955	Merge `2c10349b6b` into `b7eefa1996`	2024-11-21 14:37:10 +01:00
Tobias Zimmermann	2c10349b6b	hwdb: Add quirk for Logitech MX Keys for Mac The KEY_102ND and KEY_GRAVE keys are switched on the Logitech MX Keys for Mac, so switch them back	2024-11-21 14:37:07 +01:00
Luca Boccassi	b7eefa1996	cgroup-util: fix memory leak on error CID#1565824 Follow-up for `f6793bbcf0`	2024-11-21 14:02:34 +09:00