Changeset b5e68c8 in mainline for uspace/lib/c/include/adt/char_map.h

Timestamp:

2011-05-12T16:49:44Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f36787d7

Parents:

e80329d6 (diff), 750636a (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/lib/c/include/adt/char_map.h (modified) (3 diffs)

uspace/lib/c/include/adt/char_map.h

@@ -41 +41 @@
 
 /** Invalid assigned value used also if an entry does not exist. */
-#define CHAR_MAP_NULL   (-1)
+#define CHAR_MAP_NULL  (-1)
 
 /** Type definition of the character string to integer map.
  *  @see char_map
  */
-typedef struct char_map char_map_t;
-
-/** Type definition of the character string to integer map pointer.
- *  @see char_map
- */
-typedef char_map_t *char_map_ref;
+typedef struct char_map char_map_t;
 
 /** Character string to integer map item.
@@ -61 +56 @@
 struct char_map {
         /** Actually mapped character. */
-        char c;
+        uint8_t c;
         /** Stored integral value. */
         int value;
@@ -69 +64 @@
         int next;
         /** Next character array. */
-        char_map_ref *items;
+        char_map_t **items;
         /** Consistency check magic value. */
         int magic;
 };
 
-extern int char_map_initialize(char_map_ref);
-extern void char_map_destroy(char_map_ref);
-extern int char_map_exclude(char_map_ref, const char *, size_t);
-extern int char_map_add(char_map_ref, const char *, size_t, const int);
-extern int char_map_find(const char_map_ref, const char *, size_t);
-extern int char_map_update(char_map_ref, const char *, size_t, const int);
+extern int char_map_initialize(char_map_t *);
+extern void char_map_destroy(char_map_t *);
+extern int char_map_exclude(char_map_t *, const uint8_t *, size_t);
+extern int char_map_add(char_map_t *, const uint8_t *, size_t, const int);
+extern int char_map_find(const char_map_t *, const uint8_t *, size_t);
+extern int char_map_update(char_map_t *, const uint8_t *, size_t, const int);
 
 #endif