Changes in uspace/lib/c/generic/adt/char_map.c [2544442:4eca056] in mainline

File:

• uspace/lib/c/generic/adt/char_map.c (modified) (12 diffs)

uspace/lib/c/generic/adt/char_map.c

@@ -65 +65 @@
  */
 static int
-char_map_add_item(char_map_ref map, const char *identifier, size_t length,
+char_map_add_item(char_map_t *map, const char *identifier, size_t length,
     const int value)
 {
         if (map->next == (map->size - 1)) {
-                char_map_ref *tmp;
-
-                tmp = (char_map_ref *) realloc(map->items,
-                    sizeof(char_map_ref) * 2 * map->size);
+                char_map_t **tmp;
+
+                tmp = (char_map_t **) realloc(map->items,
+                    sizeof(char_map_t *) * 2 * map->size);
                 if (!tmp)
                         return ENOMEM;
@@ -80 +80 @@
         }
 
-        map->items[map->next] = (char_map_ref) malloc(sizeof(char_map_t));
+        map->items[map->next] = (char_map_t *) malloc(sizeof(char_map_t));
         if (!map->items[map->next])
                 return ENOMEM;
@@ -110 +110 @@
  * @returns             FALSE otherwise.
  */
-static int char_map_is_valid(const char_map_ref map)
+static int char_map_is_valid(const char_map_t *map)
 {
         return map && (map->magic == CHAR_MAP_MAGIC_VALUE);
@@ -139 +139 @@
  */
 int
-char_map_add(char_map_ref map, const char *identifier, size_t length,
+char_map_add(char_map_t *map, const char *identifier, size_t length,
     const int value)
 {
@@ -172 +172 @@
  * @param[in,out] map   The character string to integer map.
  */
-void char_map_destroy(char_map_ref map)
+void char_map_destroy(char_map_t *map)
 {
         if (char_map_is_valid(map)) {
@@ -200 +200 @@
  * @returns             NULL if the key is not assigned a node.
  */
-static char_map_ref
-char_map_find_node(const char_map_ref map, const char *identifier,
+static char_map_t *
+char_map_find_node(const char_map_t *map, const char *identifier,
     size_t length)
 {
@@ -224 +224 @@
         }
 
-        return map;
+        return (char_map_t *) map;
 }
 
@@ -242 +242 @@
  * @returns             CHAR_MAP_NULL if the key is not assigned a value.
  */
-int char_map_exclude(char_map_ref map, const char *identifier, size_t length)
-{
-        char_map_ref node;
+int char_map_exclude(char_map_t *map, const char *identifier, size_t length)
+{
+        char_map_t *node;
 
         node = char_map_find_node(map, identifier, length);
@@ -270 +270 @@
  *  @returns            CHAR_MAP_NULL if the key is not assigned a value.
  */
-int char_map_find(const char_map_ref map, const char *identifier, size_t length)
-{
-        char_map_ref node;
+int char_map_find(const char_map_t *map, const char *identifier, size_t length)
+{
+        char_map_t *node;
 
         node = char_map_find_node(map, identifier, length);
@@ -285 +285 @@
  *  @returns            ENOMEM if there is not enough memory left.
  */
-int char_map_initialize(char_map_ref map)
+int char_map_initialize(char_map_t *map)
 {
         if (!map)
@@ -295 +295 @@
         map->next = 0;
 
-        map->items = malloc(sizeof(char_map_ref) * map->size);
+        map->items = malloc(sizeof(char_map_t *) * map->size);
         if (!map->items) {
                 map->magic = 0;
@@ -330 +330 @@
  */
 int
-char_map_update(char_map_ref map, const char *identifier, const size_t length,
+char_map_update(char_map_t *map, const char *identifier, const size_t length,
     const int value)
 {
-        char_map_ref node;
+        char_map_t *node;
 
         node = char_map_find_node(map, identifier, length);