Changeset 3aae4e8 in mainline for uspace/lib/socket/include/adt/measured_strings.h

Timestamp:

2010-04-04T22:07:05Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

23de644

Parents:

9f10660f (diff), 73060801 (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/measured_strings.h (moved) (moved from uspace/srv/net/structures/measured_strings.h ) (6 diffs)

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

@@ -71 +71 @@
  *  @returns NULL if there is not enough memory left.
  */
-measured_string_ref measured_string_create_bulk(const char * string, size_t length);
+extern measured_string_ref measured_string_create_bulk(const char * string, size_t length);
 
 /** Copies the given measured string with separated header and data parts.
@@ -79 +79 @@
  *  @returns NULL if there is not enough memory left.
  */
-measured_string_ref measured_string_copy(measured_string_ref source);
+extern measured_string_ref measured_string_copy(measured_string_ref source);
 
 /** Receives a measured strings array from a calling module.
@@ -95 +95 @@
  *  @returns Other error codes as defined for the async_data_write_finalize() function.
  */
-int measured_strings_receive(measured_string_ref * strings, char ** data, size_t count);
+extern int measured_strings_receive(measured_string_ref * strings, char ** data, size_t count);
 
 /** Replies the given measured strings array to a calling module.
@@ -108 +108 @@
  *  @returns Other error codes as defined for the async_data_read_finalize() function.
  */
-int measured_strings_reply(const measured_string_ref strings, size_t count);
+extern int measured_strings_reply(const measured_string_ref strings, size_t count);
 
 /** Receives a measured strings array from another module.
@@ -124 +124 @@
  *  @returns Other error codes as defined for the async_data_read_start() function.
  */
-int measured_strings_return(int phone, measured_string_ref * strings, char ** data, size_t count);
+extern int measured_strings_return(int phone, measured_string_ref * strings, char ** data, size_t count);
 
 /** Sends the given measured strings array to another module.
@@ -136 +136 @@
  *  @returns Other error codes as defined for the async_data_write_start() function.
  */
-int measured_strings_send(int phone, const measured_string_ref strings, size_t count);
+extern int measured_strings_send(int phone, const measured_string_ref strings, size_t count);
 
 #endif