More simplification of property functions

diff --git a/include/element.h b/include/element.h
index 3549f07..5bd987b 100644 (file)
--- a/include/element.h
+++ b/include/element.h
@@ -96,11 +96,9 @@ extern struct connman_element *connman_element_create(const char *name);
 extern struct connman_element *connman_element_ref(struct connman_element *element);
 extern void connman_element_unref(struct connman_element *element);
 
-extern int connman_element_add_static_property(struct connman_element *element,
-                               const char *name, int type, const void *value);
 extern int connman_element_set_static_property(struct connman_element *element,
                                const char *name, int type, const void *value);
-extern int connman_element_add_static_array_property(struct connman_element *element,
+extern int connman_element_set_static_array_property(struct connman_element *element,
                        const char *name, int type, const void *value, int len);
 extern int connman_element_set_property(struct connman_element *element,
                                enum connman_property_id id, const void *value);

diff --git a/include/property.h b/include/property.h
index e792487..ec8254c 100644 (file)
--- a/include/property.h
+++ b/include/property.h
@@ -43,20 +43,8 @@ enum connman_property_id {
        CONNMAN_PROPERTY_ID_IPV4_NAMESERVER,
 };
 
-/**
- * connman_property_flags:
- * @CONNMAN_PROPERTY_FLAG_STATIC: read-only property
- * @CONNMAN_PROPERTY_FLAG_REFERENCE: inheritated value (reference only)
- */
-enum connman_property_flags {
-       CONNMAN_PROPERTY_FLAG_STATIC     = (1 << 0),
-       CONNMAN_PROPERTY_FLAG_REFERENCE  = (1 << 1),
-};
-
 struct connman_property {
-       enum connman_property_flags flags;
        enum connman_property_id id;
-       char *name;
        int type;
        int subtype;
        void *value;

diff --git a/src/device.c b/src/device.c
index 054e1aa..a053044 100644 (file)
--- a/src/device.c
+++ b/src/device.c
@@ -746,7 +746,7 @@ struct connman_device *connman_device_create(const char *node,
 
        str = type2string(type);
        if (str != NULL)
-               connman_element_add_static_property(&device->element,
+               connman_element_set_static_property(&device->element,
                                        "Type", DBUS_TYPE_STRING, &str);
 
        device->element.ipv4.method = CONNMAN_IPV4_METHOD_DHCP;

diff --git a/src/element.c b/src/element.c
index f6742f2..70fc82a 100644 (file)
--- a/src/element.c
+++ b/src/element.c
@@ -421,10 +421,7 @@ static void unregister_property(gpointer data)
 
        DBG("property %p", property);
 
-       if (!(property->flags & CONNMAN_PROPERTY_FLAG_REFERENCE))
-               g_free(property->value);
-
-       g_free(property->name);
+       g_free(property->value);
        g_free(property);
 }
 
@@ -439,7 +436,7 @@ void __connman_element_initialize(struct connman_element *element)
        element->index   = -1;
        element->enabled = FALSE;
 
-       element->properties = g_hash_table_new_full(g_str_hash, g_direct_equal,
+       element->properties = g_hash_table_new_full(g_str_hash, g_str_equal,
                                                g_free, unregister_property);
 }
 
@@ -511,7 +508,7 @@ void connman_element_unref(struct connman_element *element)
        }
 }
 
-int connman_element_add_static_property(struct connman_element *element,
+int connman_element_set_static_property(struct connman_element *element,
                                const char *name, int type, const void *value)
 {
        struct connman_property *property;
@@ -525,10 +522,8 @@ int connman_element_add_static_property(struct connman_element *element,
        if (property == NULL)
                return -ENOMEM;
 
-       property->flags = CONNMAN_PROPERTY_FLAG_STATIC;
-       property->id    = CONNMAN_PROPERTY_ID_INVALID;
-       property->name  = g_strdup(name);
-       property->type  = type;
+       property->id   = CONNMAN_PROPERTY_ID_INVALID;
+       property->type = type;
 
        DBG("name %s type %d value %p", name, type, value);
 
@@ -545,50 +540,14 @@ int connman_element_add_static_property(struct connman_element *element,
 
        __connman_element_lock(element);
 
-       g_hash_table_insert(element->properties, g_strdup(name), property);
+       g_hash_table_replace(element->properties, g_strdup(name), property);
 
        __connman_element_unlock(element);
 
        return 0;
 }
 
-int connman_element_set_static_property(struct connman_element *element,
-                               const char *name, int type, const void *value)
-{
-       struct connman_property *property;
-
-       DBG("element %p name %s", element, element->name);
-
-       if (type != DBUS_TYPE_STRING && type != DBUS_TYPE_BYTE)
-               return -EINVAL;
-
-       __connman_element_lock(element);
-
-       property = g_hash_table_lookup(element->properties, name);
-       if (property != NULL) {
-               property->flags |= CONNMAN_PROPERTY_FLAG_STATIC;
-
-               property->type = type;
-               g_free(property->value);
-
-               switch (type) {
-               case DBUS_TYPE_STRING:
-                       property->value = g_strdup(*((const char **) value));
-                       break;
-               case DBUS_TYPE_BYTE:
-                       property->value = g_try_malloc(1);
-                       if (property->value != NULL)
-                               memcpy(property->value, value, 1);
-                       break;
-               }
-       }
-
-       __connman_element_unlock(element);
-
-       return 0;
-}
-
-int connman_element_add_static_array_property(struct connman_element *element,
+int connman_element_set_static_array_property(struct connman_element *element,
                        const char *name, int type, const void *value, int len)
 {
        struct connman_property *property;
@@ -602,9 +561,7 @@ int connman_element_add_static_array_property(struct connman_element *element,
        if (property == NULL)
                return -ENOMEM;
 
-       property->flags   = CONNMAN_PROPERTY_FLAG_STATIC;
        property->id      = CONNMAN_PROPERTY_ID_INVALID;
-       property->name    = g_strdup(name);
        property->type    = DBUS_TYPE_ARRAY;
        property->subtype = type;
 
@@ -623,7 +580,7 @@ int connman_element_add_static_array_property(struct connman_element *element,
 
        __connman_element_lock(element);
 
-       g_hash_table_insert(element->properties, g_strdup(name), property);
+       g_hash_table_replace(element->properties, g_strdup(name), property);
 
        __connman_element_unlock(element);
 
@@ -744,19 +701,16 @@ gboolean connman_element_get_static_property(struct connman_element *element,
        __connman_element_lock(element);
 
        property = g_hash_table_lookup(element->properties, name);
-       if (property != NULL &&
-                       (property->flags & CONNMAN_PROPERTY_FLAG_STATIC)) {
-               if (g_str_equal(property->name, name) == TRUE) {
-                       switch (property->type) {
-                       case DBUS_TYPE_STRING:
-                               *((char **) value) = property->value;
-                               found = TRUE;
-                               break;
-                       case DBUS_TYPE_BYTE:
-                               memcpy(value, property->value, 1);
-                               found = TRUE;
-                               break;
-                       }
+       if (property != NULL) {
+               switch (property->type) {
+               case DBUS_TYPE_STRING:
+                       *((char **) value) = property->value;
+                       found = TRUE;
+                       break;
+               case DBUS_TYPE_BYTE:
+                       memcpy(value, property->value, 1);
+                       found = TRUE;
+                       break;
                }
        }
 
@@ -780,13 +734,10 @@ gboolean connman_element_get_static_array_property(struct connman_element *eleme
        __connman_element_lock(element);
 
        property = g_hash_table_lookup(element->properties, name);
-       if (property != NULL &&
-                       (property->flags & CONNMAN_PROPERTY_FLAG_STATIC)) {
-               if (g_str_equal(property->name, name) == TRUE) {
-                       *((char **) value) = property->value;
-                       *len = property->size;
-                       found = TRUE;
-               }
+       if (property != NULL) {
+               *((char **) value) = property->value;
+               *len = property->size;
+               found = TRUE;
        }
 
        __connman_element_unlock(element);
@@ -805,10 +756,8 @@ gboolean connman_element_match_static_property(struct connman_element *element,
        __connman_element_lock(element);
 
        property = g_hash_table_lookup(element->properties, name);
-       if (property != NULL &&
-                       (property->flags & CONNMAN_PROPERTY_FLAG_STATIC)) {
-               if (g_str_equal(property->name, name) == TRUE &&
-                                       property->type == DBUS_TYPE_STRING)
+       if (property != NULL) {
+               if (property->type == DBUS_TYPE_STRING)
                        result = g_str_equal(property->value,
                                                *((const char **) value));
        }

diff --git a/src/network.c b/src/network.c
index 16df43e..458ae82 100644 (file)
--- a/src/network.c
+++ b/src/network.c
@@ -462,10 +462,10 @@ struct connman_network *connman_network_create(const char *identifier,
 
        str = type2string(type);
        if (str != NULL)
-               connman_element_add_static_property(&network->element,
+               connman_element_set_static_property(&network->element,
                                        "Type", DBUS_TYPE_STRING, &str);
 
-       connman_element_add_static_property(&network->element,
+       connman_element_set_static_property(&network->element,
                                        "Strength", DBUS_TYPE_BYTE, &strength);
 
        network->type = type;