Changeset 85a4350 in mainline for uspace/lib/c/generic/iplink.c

Timestamp:

2012-06-03T15:09:27Z (12 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

652b776

Parents:

840e227 (diff), 3123d2a (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 with mainline

File:

• uspace/lib/c/generic/iplink.c (modified) (1 diff)

uspace/lib/c/generic/iplink.c

@@ -49 +49 @@
     iplink_t **riplink)
 {
-        iplink_t *iplink = NULL;
-        int rc;
-
-        iplink = calloc(1, sizeof(iplink_t));
+        iplink_t *iplink = calloc(1, sizeof(iplink_t));
         if (iplink == NULL)
                 return ENOMEM;
-
+        
         iplink->sess = sess;
         iplink->ev_ops = ev_ops;
-
+        
         async_exch_t *exch = async_exchange_begin(sess);
-
-        rc = async_connect_to_me(exch, 0, 0, 0, iplink_cb_conn, iplink);
+        
+        int rc = async_connect_to_me(exch, 0, 0, 0, iplink_cb_conn, iplink);
         async_exchange_end(exch);
-
+        
         if (rc != EOK)
                 goto error;
-
+        
         *riplink = iplink;
         return EOK;
-
+        
 error:
         if (iplink != NULL)
                 free(iplink);
-
+        
         return rc;
 }