Changeset 26e7d6d in mainline for uspace/lib/c/generic/adt/measured_strings.c

Timestamp:

2011-09-19T16:31:00Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

a347a11

Parents:

3842a955 (diff), 086290d (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/generic/adt/measured_strings.c (modified) (12 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
@@ -298 +297 @@
  * size has to be negotiated in advance.
  *
- * @param[in] phone     The other module phone.
+ * @param[in] exch      Exchange.
  * @param[out] strings  The returned measured strings array.
  * @param[out] data     The measured strings data. This memory block stores the
@@ -305 +304 @@
  * @return              EOK on success.
  * @return              EINVAL if the strings or data parameter is NULL.
- * @return              EINVAL if the phone or count parameter is not positive.
+ * @return              EINVAL if the exch or count parameter is invalid.
  * @return              EINVAL if the sent array differs in size.
  * @return              ENOMEM if there is not enough memory left.
@@ -311 +310 @@
  *                      async_data_read_start() function.
  */
-int
-measured_strings_return(int phone, measured_string_t **strings, uint8_t **data,
-    size_t count)
+int measured_strings_return(async_exch_t *exch, measured_string_t **strings,
+    uint8_t **data, size_t count)
 {
         size_t *lengths;
@@ -320 +318 @@
         int rc;
 
-        if ((phone < 0) || (!strings) || (!data) || (count <= 0))
+        if ((exch == NULL) || (!strings) || (!data) || (count <= 0))
                 return EINVAL;
 
@@ -327 +325 @@
                 return ENOMEM;
 
-        rc = async_obsolete_data_read_start(phone, lengths,
+        rc = async_data_read_start(exch, lengths,
             sizeof(size_t) * (count + 1));
         if (rc != EOK) {
@@ -352 +350 @@
                 (*strings)[index].length = lengths[index];
                 if (lengths[index] > 0) {
-                        rc = async_obsolete_data_read_start(phone, next, lengths[index]);
+                        rc = async_data_read_start(exch, next, lengths[index]);
                         if (rc != EOK) {
                                 free(lengths);
@@ -376 +374 @@
  * size has to be negotiated in advance.
  *
- * @param[in] phone     The other module phone.
+ * @param[in] exch      Exchange.
  * @param[in] strings   The measured strings array to be transferred.
  * @param[in] count     The measured strings array size.
  * @return              EOK on success.
  * @return              EINVAL if the strings parameter is NULL.
- * @return              EINVAL if the phone or count parameter is not positive.
+ * @return              EINVAL if the exch or count parameter is invalid.
  * @return              Other error codes as defined for the
  *                      async_data_write_start() function.
  */
-int
-measured_strings_send(int phone, const measured_string_t *strings,
+int measured_strings_send(async_exch_t *exch, const measured_string_t *strings,
     size_t count)
 {
@@ -393 +390 @@
         int rc;
 
-        if ((phone < 0) || (!strings) || (count <= 0))
+        if ((exch == NULL) || (!strings) || (count <= 0))
                 return EINVAL;
 
@@ -400 +397 @@
                 return ENOMEM;
 
-        rc = async_obsolete_data_write_start(phone, lengths,
+        rc = async_data_write_start(exch, lengths,
             sizeof(size_t) * (count + 1));
         if (rc != EOK) {
@@ -411 +408 @@
         for (index = 0; index < count; index++) {
                 if (strings[index].length > 0) {
-                        rc = async_obsolete_data_write_start(phone, strings[index].value,
+                        rc = async_data_write_start(exch, strings[index].value,
                             strings[index].length);
                         if (rc != EOK)
@@ -423 +420 @@
 /** @}
  */
-