diff options
| author | Keith Packard <keithp@keithp.com> | 2013-11-16 23:25:50 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2014-01-12 10:14:50 -0800 |
| commit | 86647e7279163b13492d39ecb9c44414b752a61e (patch) | |
| tree | a581a239fd4ced75bd5cae3f9c16d372665bd340 /config | |
| parent | b7633c6ff2c273621df6c0fac9c269f8ab217a46 (diff) | |
config/udev: handle const strings
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Diffstat (limited to 'config')
| -rw-r--r-- | config/udev.c | 20 |
1 files 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); |