Changeset cb569e6 in mainline for uspace/lib/c/generic/net/modules.c

Timestamp:

2010-11-18T21:58:27Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

4e5c7ba

Parents:

69e0d6d (diff), 45f04f8 (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/net/modules.c (modified) (5 diffs)

uspace/lib/c/generic/net/modules.c

@@ -41 +41 @@
 #include <async.h>
 #include <malloc.h>
-#include <err.h>
+#include <errno.h>
 #include <sys/time.h>
 
@@ -137 +137 @@
     ipcarg_t arg3, async_client_conn_t client_receiver, suseconds_t timeout)
 {
-        ERROR_DECLARE;
+        int rc;
         
         /* Connect to the needed service */
@@ -144 +144 @@
                 /* Request the bidirectional connection */
                 ipcarg_t phonehash;
-                if (ERROR_OCCURRED(ipc_connect_to_me(phone, arg1, arg2, arg3,
-                    &phonehash))) {
+                
+                rc = ipc_connect_to_me(phone, arg1, arg2, arg3, &phonehash);
+                if (rc != EOK) {
                         ipc_hangup(phone);
-                        return ERROR_CODE;
+                        return rc;
                 }
                 async_new_connection(phonehash, 0, NULL, client_receiver);
@@ -212 +213 @@
 int data_receive(void **data, size_t *length)
 {
-        ERROR_DECLARE;
-
         ipc_callid_t callid;
+        int rc;
 
         if (!data || !length)
@@ -229 +229 @@
 
         // fetch the data
-        if (ERROR_OCCURRED(async_data_write_finalize(callid, *data, *length))) {
+        rc = async_data_write_finalize(callid, *data, *length);
+        if (rc != EOK) {
                 free(data);
-                return ERROR_CODE;
+                return rc;
         }