diff options
Diffstat (limited to 'config/dbus.c')
| -rw-r--r-- | config/dbus.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/config/dbus.c b/config/dbus.c index 86d9d287f..72a0a05dd 100644 --- a/config/dbus.c +++ b/config/dbus.c @@ -81,7 +81,7 @@ add_device(DBusMessage *message, DBusMessage *reply, DBusError *error) MALFORMED_MESSAGE(); } - options = xcalloc(sizeof(*options), 1); + options = calloc(sizeof(*options), 1); if (!options) { ErrorF("[config/dbus] couldn't allocate option\n"); return BadAlloc; @@ -97,7 +97,7 @@ add_device(DBusMessage *message, DBusMessage *reply, DBusError *error) /* signature should be [ss][ss]... */ while (dbus_message_iter_get_arg_type(&iter) == DBUS_TYPE_ARRAY) { - tmpo = xcalloc(sizeof(*tmpo), 1); + tmpo = calloc(sizeof(*tmpo), 1); if (!tmpo) { ErrorF("[config/dbus] couldn't allocate option\n"); ret = BadAlloc; @@ -185,10 +185,10 @@ unwind: tmpo = options; options = options->next; if (tmpo->key) - xfree(tmpo->key); + free(tmpo->key); if (tmpo->value) - xfree(tmpo->value); - xfree(tmpo); + free(tmpo->value); + free(tmpo); } return ret; |