mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-07-02 17:13:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

use snprintf to get identifier len

Browse source
This commit is contained in:
Tony Crisci 2017-12-19 04:57:42 -05:00
parent 9df4a2c7a8
commit 730af5e721
1 changed files with 2 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
sway/input/input-manager.c
View file

@ -34,13 +34,6 @@ static struct sway_seat *input_manager_get_seat(
return sway_seat_create(input, seat_name); return sway_seat_create(input, seat_name);
} }
static inline int strlen_num(int num) {
if (num == 0) {
return 2;
}
return (int)((ceil(log10(abs(num)))+2));
}
static char *get_device_identifier(struct wlr_input_device *device) { static char *get_device_identifier(struct wlr_input_device *device) {
int vendor = device->vendor; int vendor = device->vendor;
int product = device->product; int product = device->product;
@ -54,19 +47,14 @@ static char *get_device_identifier(struct wlr_input_device *device) {
} }
} }
int len = const char *fmt = "%d:%d:%s";
(strlen(name) + int len = snprintf(NULL, 0, fmt, vendor, product, name) + 1;
strlen_num(device->vendor) +
strlen_num(device->product) +
3) * sizeof(char);
char *identifier = malloc(len); char *identifier = malloc(len);
if (!identifier) { if (!identifier) {
sway_log(L_ERROR, "Unable to allocate unique input device name"); sway_log(L_ERROR, "Unable to allocate unique input device name");
return NULL; return NULL;
} }
const char *fmt = "%d:%d:%s";
snprintf(identifier, len, fmt, vendor, product, name); snprintf(identifier, len, fmt, vendor, product, name);
free(name); free(name);
return identifier; return identifier;