Changeset d7ff048 in mainline for uspace/lib/c/generic/ns.c

Timestamp:

2011-10-08T13:08:53Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

bf08ff0

Parents:

8367d1d (diff), 80099c19 (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

@@ -54 +54 @@
         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;
@@ -75 +76 @@
 {
         async_exch_t *exch = async_exchange_begin(session_ns);
+        if (!exch)
+                return NULL;
         async_sess_t *sess =
             async_connect_me_to_blocking(mgmt, exch, service, arg2, arg3);
         async_exchange_end(exch);
+
+        if (!sess)
+                return NULL;
         
         /*