Changeset 4611094f in mainline for uspace/app/sbi/src/intmap.c

Timestamp:

2011-03-20T19:09:19Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

cfbcd86

Parents:

8c76c30 (diff), 7308e84 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge mainline changes

File:

• uspace/app/sbi/src/intmap.c (modified) (5 diffs)

uspace/app/sbi/src/intmap.c

@@ -50 +50 @@
 }
 
+/** Deinitialize map.
+ *
+ * The map must be already empty.
+ *
+ * @param intmap        Map to initialize.
+ */
+void intmap_fini(intmap_t *intmap)
+{
+        list_fini(&intmap->elem);
+}
+
 /** Set value corresponding to a key.
  *
@@ -56 +67 @@
  * is removed from the map.
  *
- * @param intmap        Map.
- * @param key           Key (integer).
- * @param value         Value (must be a pointer) or @c NULL.
+ * @param intmap        Map
+ * @param key           Key (integer)
+ * @param value         Value (must be a pointer) or @c NULL
  */
 void intmap_set(intmap_t *intmap, int key, void *value)
@@ -75 +86 @@
                                 /* Remove map element. */
                                 list_remove(&intmap->elem, node);
-                                node->data = NULL;
-                                free(node);
+                                free(elem);
                         }
                         return;
@@ -98 +108 @@
 /** Get value corresponding to a key.
  *
- * @param intmap        Map.
- * @param key           Key for which to retrieve mapping.
+ * @param intmap        Map
+ * @param key           Key for which to retrieve mapping
  *
  * @return              Value correspoding to @a key or @c NULL if no mapping
@@ -121 +131 @@
         return NULL;
 }
+
+/** Get first element in the map.
+ *
+ * For iterating over the map, this returns the first element (in no
+ * particular order).
+ *
+ * @param intmap        Map
+ * @return              Map element or NULL if the map is empty
+ */
+map_elem_t *intmap_first(intmap_t *intmap)
+{
+        list_node_t *node;
+
+        node = list_first(&intmap->elem);
+        if (node == NULL)
+                return NULL;
+
+        return list_node_data(node, map_elem_t *);
+}
+
+/** Get element key.
+ *
+ * Giver a map element, return the key.
+ *
+ * @param elem          Map element
+ * @return              Key
+ */
+int intmap_elem_get_key(map_elem_t *elem)
+{
+        return elem->key;
+}
+
+/** Get element value.
+ *
+ * Giver a map element, return the value.
+ *
+ * @param elem          Map element
+ * @return              Value
+ */
+void *intmap_elem_get_value(map_elem_t *elem)
+{
+        return elem->value;
+}