Changeset bfd7aac in mainline for uspace/srv/net/socket/socket_client.c

Timestamp:

2010-02-17T19:19:08Z (15 years ago)

Author:

Lukas Mejdrech <lukasmejdrech@…>

Branches:

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

Children:

1e2e0c1e

Parents:

01a9ef5 (diff), b8da2a3 (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/srv/net/socket/socket_client.c (modified) (4 diffs)

uspace/srv/net/socket/socket_client.c

@@ -541 +541 @@
         socket_ref              new_socket;
         aid_t                   message_id;
-        int                             result;
+        ipcarg_t                ipc_result;
+        int                     result;
         ipc_call_t              answer;
 
@@ -592 +593 @@
         ipc_data_read_start( socket->phone, cliaddr, * addrlen );
         fibril_rwlock_write_unlock( & socket_globals.lock );
-        async_wait_for( message_id, ( ipcarg_t * ) & result );
+        async_wait_for( message_id, & ipc_result );
+        result = (int) ipc_result;
         if( result > 0 ){
                 if( result != socket_id ){
@@ -734 +736 @@
         socket_ref              socket;
         aid_t                   message_id;
-        int                             result;
+        ipcarg_t                ipc_result;
+        int                     result;
         size_t                  fragments;
         size_t *                lengths;
@@ -793 +796 @@
                 }
         }
-        async_wait_for( message_id, ( ipcarg_t * ) & result );
+        async_wait_for( message_id, & ipc_result );
+        result = (int) ipc_result;
         // if successful
         if( result == EOK ){