From 29fdbe87a8f2e0f13dcc027ba78eefe85263907d Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Mon, 1 Sep 2008 20:09:10 +0200 Subject: [PATCH] Use element->index and element->name variables --- plugins/hal.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/plugins/hal.c b/plugins/hal.c index 2afe856..942faaf 100644 --- a/plugins/hal.c +++ b/plugins/hal.c @@ -85,18 +85,18 @@ static void device_netdev(LibHalContext *ctx, const char *udi, { if (element->subtype == CONNMAN_ELEMENT_SUBTYPE_ETHERNET || element->subtype == CONNMAN_ELEMENT_SUBTYPE_WIFI) { - element->netdev.index = libhal_device_get_property_int(ctx, + element->index = libhal_device_get_property_int(ctx, udi, "net.linux.ifindex", NULL); - element->netdev.name = libhal_device_get_property_string(ctx, + element->name = libhal_device_get_property_string(ctx, udi, "net.interface", NULL); } if (element->subtype == CONNMAN_ELEMENT_SUBTYPE_MODEM) { - element->netdev.index = libhal_device_get_property_int(ctx, + element->index = libhal_device_get_property_int(ctx, udi, "serial.port", NULL); - element->netdev.name = libhal_device_get_property_string(ctx, + element->name = libhal_device_get_property_string(ctx, udi, "serial.device", NULL); } } @@ -108,15 +108,22 @@ static void create_element(LibHalContext *ctx, const char *udi, DBG("ctx %p udi %s", ctx, udi); - element = connman_element_create(); + element = connman_element_create(NULL); - element->name = g_path_get_basename(udi); element->type = CONNMAN_ELEMENT_TYPE_DEVICE; element->subtype = subtype; device_info(ctx, udi, element); device_netdev(ctx, udi, element); + if (element->name == NULL) { + element->name = g_path_get_basename(udi); + if (element->name == NULL) { + connman_element_unref(element); + return; + } + } + g_static_mutex_lock(&element_mutex); connman_element_register(element, NULL); -- 2.7.4