Changeset 925a21e in mainline for uspace/lib/c/generic/ns.c

Timestamp:

2011-09-24T14:20:29Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

5bf76c1

Parents:

867e2555 (diff), 1ab4aca (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/ns.c (modified) (2 diffs)

uspace/lib/c/generic/ns.c

@@ -52 +52 @@
 {
         async_exch_t *exch = async_exchange_begin(session_ns);
+        if (!exch)
+                return NULL;
         async_sess_t *sess =
             async_connect_me_to(mgmt, exch, service, arg2, arg3);
         async_exchange_end(exch);
+
+        if (!sess)
+                return NULL;
+        
+        /*
+         * FIXME Ugly hack to work around limitation of implementing
+         * parallel exchanges using multiple connections. Shift out
+         * first argument for non-initial connections.
+         */
+        async_sess_args_set(sess, arg2, arg3, 0);
         
         return sess;
@@ -66 +78 @@
             async_connect_me_to_blocking(mgmt, exch, service, arg2, arg3);
         async_exchange_end(exch);
+        
+        /*
+         * FIXME Ugly hack to work around limitation of implementing
+         * parallel exchanges using multiple connections. Shift out
+         * first argument for non-initial connections.
+         */
+        async_sess_args_set(sess, arg2, arg3, 0);
         
         return sess;