Changeset 59ecd4a in mainline for uspace/lib/socket/include/adt/char_map.h

Timestamp:

2010-04-04T21:41:47Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

5db9084

Parents:

36a75a2 (diff), ee7e82a9 (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/socket/include/adt/char_map.h (moved) (moved from uspace/srv/net/structures/char_map.h ) (5 diffs)

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

@@ -89 +89 @@
  *  @returns Other error codes as defined for the char_map_add_item() function.
  */
-int char_map_add(char_map_ref map, const char * identifier, size_t length, const int value);
+extern int char_map_add(char_map_ref map, const char * identifier, size_t length, const int value);
 
 /** Clears and destroys the map.
  *  @param[in,out] map The character string to integer map.
  */
-void char_map_destroy(char_map_ref map);
+extern void char_map_destroy(char_map_ref map);
 
 /** Excludes the value assigned to the key from the map.
@@ -104 +104 @@
  *  @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);
+extern int char_map_exclude(char_map_ref map, const char * identifier, size_t length);
 
 /** Returns the value assigned to the key from the map.
@@ -113 +113 @@
  *  @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);
+extern int char_map_find(const char_map_ref map, const char * identifier, size_t length);
 
 /** Initializes the map.
@@ -121 +121 @@
  *  @returns ENOMEM if there is not enough memory left.
  */
-int char_map_initialize(char_map_ref map);
+extern int char_map_initialize(char_map_ref map);
 
 /** Adds or updates the value with the key to the map.
@@ -135 +135 @@
  *  @returns Other error codes as defined for the char_map_add_item() function.
  */
-int char_map_update(char_map_ref map, const char * identifier, size_t length, const int value);
+extern int char_map_update(char_map_ref map, const char * identifier, size_t length, const int value);
 
 #endif