diff options
Diffstat (limited to 'xorg-server/config')
| -rw-r--r-- | xorg-server/config/dbus-core.c | 8 | ||||
| -rw-r--r-- | xorg-server/config/udev.c | 24 |
2 files changed, 17 insertions, 15 deletions
diff --git a/xorg-server/config/dbus-core.c b/xorg-server/config/dbus-core.c index 324258718..768a98454 100644 --- a/xorg-server/config/dbus-core.c +++ b/xorg-server/config/dbus-core.c @@ -45,10 +45,10 @@ struct dbus_core_info { }; static struct dbus_core_info bus_info; -static CARD32 reconnect_timer(OsTimerPtr timer, CARD32 time, pointer arg); +static CARD32 reconnect_timer(OsTimerPtr timer, CARD32 time, void *arg); static void -wakeup_handler(pointer data, int err, pointer read_mask) +wakeup_handler(void *data, int err, void *read_mask) { struct dbus_core_info *info = data; @@ -63,7 +63,7 @@ wakeup_handler(pointer data, int err, pointer read_mask) } static void -block_handler(pointer data, struct timeval **tv, pointer read_mask) +block_handler(void *data, struct timeval **tv, void *read_mask) { } @@ -185,7 +185,7 @@ connect_to_bus(void) } static CARD32 -reconnect_timer(OsTimerPtr timer, CARD32 time, pointer arg) +reconnect_timer(OsTimerPtr timer, CARD32 time, void *arg) { if (connect_to_bus()) { TimerFree(bus_info.timer); diff --git a/xorg-server/config/udev.c b/xorg-server/config/udev.c index b55b78ec5..436b8f038 100644 --- a/xorg-server/config/udev.c +++ b/xorg-server/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); @@ -289,7 +291,7 @@ device_removed(struct udev_device *device) } static void -wakeup_handler(pointer data, int err, pointer read_mask) +wakeup_handler(void *data, int err, void *read_mask) { int udev_fd = udev_monitor_get_fd(udev_monitor); struct udev_device *udev_device; @@ -322,7 +324,7 @@ wakeup_handler(pointer data, int err, pointer read_mask) } static void -block_handler(pointer data, struct timeval **tv, pointer read_mask) +block_handler(void *data, struct timeval **tv, void *read_mask) { } |