Changeset e6a78b9 in mainline for uspace/lib/c/generic/inetping.c

Timestamp:

2012-06-29T15:31:44Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

9432f08

Parents:

34ab31c (diff), 0bbd13e (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/inetping.c (modified) (2 diffs)

uspace/lib/c/generic/inetping.c

@@ -49 +49 @@
 
         assert(inetping_sess == NULL);
-
+        
         inetping_ev_ops = ev_ops;
-
+        
         rc = loc_service_get_id(SERVICE_NAME_INETPING, &inetping_svc,
             IPC_FLAG_BLOCKING);
         if (rc != EOK)
                 return ENOENT;
-
+        
         inetping_sess = loc_service_connect(EXCHANGE_SERIALIZE, inetping_svc,
             IPC_FLAG_BLOCKING);
         if (inetping_sess == NULL)
                 return ENOENT;
-
+        
         async_exch_t *exch = async_exchange_begin(inetping_sess);
 
         rc = async_connect_to_me(exch, 0, 0, 0, inetping_cb_conn, NULL);
         async_exchange_end(exch);
-
+        
         if (rc != EOK) {
                 async_hangup(inetping_sess);
@@ -72 +72 @@
                 return rc;
         }
-
+        
         return EOK;
 }