Changeset 41811af in mainline for uspace/lib/c/generic/adt/measured_strings.c

Timestamp:

2011-06-10T10:14:26Z (14 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

ab547063

Parents:

9536e6e (diff), 390d80d (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

File:

• uspace/lib/c/generic/adt/measured_strings.c (modified) (5 diffs)

uspace/lib/c/generic/adt/measured_strings.c

@@ -42 +42 @@
 #include <errno.h>
 #include <async.h>
+#include <async_obsolete.h>
 
 /** Creates a new measured string bundled with a copy of the given string
@@ -326 +327 @@
                 return ENOMEM;
 
-        rc = async_data_read_start(phone, lengths,
+        rc = async_obsolete_data_read_start(phone, lengths,
             sizeof(size_t) * (count + 1));
         if (rc != EOK) {
@@ -351 +352 @@
                 (*strings)[index].length = lengths[index];
                 if (lengths[index] > 0) {
-                        rc = async_data_read_start(phone, next, lengths[index]);
+                        rc = async_obsolete_data_read_start(phone, next, lengths[index]);
                         if (rc != EOK) {
                                 free(lengths);
@@ -399 +400 @@
                 return ENOMEM;
 
-        rc = async_data_write_start(phone, lengths,
+        rc = async_obsolete_data_write_start(phone, lengths,
             sizeof(size_t) * (count + 1));
         if (rc != EOK) {
@@ -410 +411 @@
         for (index = 0; index < count; index++) {
                 if (strings[index].length > 0) {
-                        rc = async_data_write_start(phone, strings[index].value,
+                        rc = async_obsolete_data_write_start(phone, strings[index].value,
                             strings[index].length);
                         if (rc != EOK)