Changeset 7494fb4 in mainline for uspace/lib/c/generic/adt/measured_strings.c

Timestamp:

2010-11-13T19:12:37Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

c7137738

Parents:

63a1e60 (diff), 71e3289 (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) (14 diffs)

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

@@ -41 +41 @@
 #include <unistd.h>
 #include <errno.h>
-#include <err.h>
 #include <async.h>
 
@@ -135 +134 @@
     size_t count)
 {
-        ERROR_DECLARE;
-
         size_t *lengths;
         size_t index;
@@ -142 +139 @@
         char *next;
         ipc_callid_t callid;
+        int rc;
 
         if ((!strings) || (!data) || (count <= 0))
@@ -155 +153 @@
                 return EINVAL;
         }
-        if (ERROR_OCCURRED(async_data_write_finalize(callid, lengths,
-            length))) {
-                free(lengths);
-                return ERROR_CODE;
+        rc = async_data_write_finalize(callid, lengths, length);
+        if (rc != EOK) {
+                free(lengths);
+                return rc;
         }
 
@@ -187 +185 @@
                                 return EINVAL;
                         }
-                        if (ERROR_OCCURRED(async_data_write_finalize(callid,
-                            next, lengths[index]))) {
+                        rc = async_data_write_finalize(callid, next,
+                            lengths[index]);
+                        if (rc != EOK) {
                                 free(*data);
                                 free(*strings);
                                 free(lengths);
-                                return ERROR_CODE;
+                                return rc;
                         }
                         (*strings)[index].value = next;
@@ -251 +250 @@
 int measured_strings_reply(const measured_string_ref strings, size_t count)
 {
-        ERROR_DECLARE;
-
         size_t *lengths;
         size_t index;
         size_t length;
         ipc_callid_t callid;
+        int rc;
 
         if ((!strings) || (count <= 0))
@@ -270 +268 @@
                 return EINVAL;
         }
-        if (ERROR_OCCURRED(async_data_read_finalize(callid, lengths, length))) {
-                free(lengths);
-                return ERROR_CODE;
+        rc = async_data_read_finalize(callid, lengths, length);
+        if (rc != EOK) {
+                free(lengths);
+                return rc;
         }
         free(lengths);
@@ -282 +281 @@
                                 return EINVAL;
                         }
-                        ERROR_PROPAGATE(async_data_read_finalize(callid,
-                            strings[index].value, strings[index].length));
+                        rc = async_data_read_finalize(callid,
+                            strings[index].value, strings[index].length);
+                        if (rc != EOK)
+                                return rc;
                 }
         }
@@ -313 +314 @@
     size_t count)
 {
-        ERROR_DECLARE;
-
         size_t *lengths;
         size_t index;
         char *next;
+        int rc;
 
         if ((phone < 0) || (!strings) || (!data) || (count <= 0))
@@ -326 +326 @@
                 return ENOMEM;
 
-        if (ERROR_OCCURRED(async_data_read_start(phone, lengths,
-            sizeof(size_t) * (count + 1)))) {
-                free(lengths);
-                return ERROR_CODE;
+        rc = async_data_read_start(phone, lengths,
+            sizeof(size_t) * (count + 1));
+        if (rc != EOK) {
+                free(lengths);
+                return rc;
         }
 
@@ -350 +351 @@
                 (*strings)[index].length = lengths[index];
                 if (lengths[index] > 0) {
-                        if (ERROR_OCCURRED(async_data_read_start(phone, next,
-                            lengths[index]))) {
+                        rc = async_data_read_start(phone, next, lengths[index]);
+                        if (rc != EOK) {
                                 free(lengths);
                                 free(data);
                                 free(strings);
-                                return ERROR_CODE;
+                                return rc;
                         }
                         (*strings)[index].value = next;
@@ -387 +388 @@
     size_t count)
 {
-        ERROR_DECLARE;
-
         size_t *lengths;
         size_t index;
+        int rc;
 
         if ((phone < 0) || (!strings) || (count <= 0))
@@ -399 +399 @@
                 return ENOMEM;
 
-        if (ERROR_OCCURRED(async_data_write_start(phone, lengths,
-            sizeof(size_t) * (count + 1)))) {
-                free(lengths);
-                return ERROR_CODE;
+        rc = async_data_write_start(phone, lengths,
+            sizeof(size_t) * (count + 1));
+        if (rc != EOK) {
+                free(lengths);
+                return rc;
         }
 
@@ -409 +410 @@
         for (index = 0; index < count; index++) {
                 if (strings[index].length > 0) {
-                        ERROR_PROPAGATE(async_data_write_start(phone,
-                            strings[index].value, strings[index].length));
+                        rc = async_data_write_start(phone, strings[index].value,
+                            strings[index].length);
+                        if (rc != EOK)
+                                return rc;
                 }
         }