diff options
| author | Mikhail Gusarov <dottedmag@dottedmag.net> | 2010-05-06 01:44:06 +0700 |
|---|---|---|
| committer | Mikhail Gusarov <dottedmag@dottedmag.net> | 2010-05-13 00:22:37 +0700 |
| commit | 3f3ff971ecff9936cebafc813af9193b97bba89c (patch) | |
| tree | fdbbad794a42488b7ffe41eed7aba4e498335f55 /config/udev.c | |
| parent | 96c7ab27c383ec767f62a7a11e5fd76f86363fbc (diff) | |
Replace X-allocation functions with their C89 counterparts
The only remaining X-functions used in server are XNF*, the rest is converted to
plain alloc/calloc/realloc/free/strdup.
X* functions are still exported from server and x* macros are still defined in
header file, so both ABI and API are not affected by this change.
Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'config/udev.c')
| -rw-r--r-- | config/udev.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/config/udev.c b/config/udev.c index 452fb5a8d..5e8d8dab0 100644 --- a/config/udev.c +++ b/config/udev.c @@ -63,7 +63,7 @@ device_added(struct udev_device *udev_device) if (!udev_device_get_property_value(udev_device, "ID_INPUT")) return; - options = xcalloc(sizeof(*options), 1); + options = calloc(sizeof(*options), 1); if (!options) return; @@ -141,26 +141,26 @@ device_added(struct udev_device *udev_device) goto unwind; for (; dev; dev = dev->next) { - xfree(dev->config_info); + free(dev->config_info); dev->config_info = xstrdup(config_info); } unwind: - xfree(config_info); + free(config_info); while (!dev && (tmpo = options)) { options = tmpo->next; - xfree(tmpo->key); - xfree(tmpo->value); - xfree(tmpo); + free(tmpo->key); + free(tmpo->value); + free(tmpo); } if (attrs.tags) { char **tag = attrs.tags; while (*tag) { - xfree(*tag); + free(*tag); tag++; } - xfree(attrs.tags); + free(attrs.tags); } return; @@ -178,7 +178,7 @@ device_removed(struct udev_device *device) remove_devices("udev", value); - xfree(value); + free(value); } static void |