From 86647e7279163b13492d39ecb9c44414b752a61e Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Sat, 16 Nov 2013 23:25:50 -0800 Subject: config/udev: handle const strings Signed-off-by: Keith Packard Reviewed-by: Adam Jackson --- config/udev.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/config/udev.c b/config/udev.c index b55b78ec5..23a53f4ae 100644 --- a/config/udev.c +++ b/config/udev.c @@ -137,11 +137,13 @@ device_added(struct udev_device *udev_device) /* construct USB ID in lowercase hex - "0000:ffff" */ if (product && sscanf(product, "%*x/%4x/%4x/%*x", &usb_vendor, &usb_model) == 2) { - if (asprintf(&attrs.usb_id, "%04x:%04x", usb_vendor, usb_model) + char *usb_id; + if (asprintf(&usb_id, "%04x:%04x", usb_vendor, usb_model) == -1) - attrs.usb_id = NULL; + usb_id = NULL; else LOG_PROPERTY(ppath, "PRODUCT", product); + attrs.usb_id = usb_id; } } if (!name) @@ -240,16 +242,16 @@ device_added(struct udev_device *udev_device) free(config_info); input_option_free_list(&input_options); - free(attrs.usb_id); - free(attrs.pnp_id); - free(attrs.product); - free(attrs.device); - free(attrs.vendor); + free((void *) attrs.usb_id); + free((void *) attrs.pnp_id); + free((void *) attrs.product); + free((void *) attrs.device); + free((void *) attrs.vendor); if (attrs.tags) { - char **tag = attrs.tags; + const char **tag = attrs.tags; while (*tag) { - free(*tag); + free((void *) *tag); tag++; } free(attrs.tags); -- cgit v1.2.3