Changes in uspace/lib/c/generic/inet/udp.c [b7fd2a0:cde999a] in mainline

File:

• uspace/lib/c/generic/inet/udp.c (modified) (20 diffs)

uspace/lib/c/generic/inet/udp.c

@@ -48 +48 @@
  * @return EOK on success or an error code
  */
-static errno_t udp_callback_create(udp_t *udp)
+static int udp_callback_create(udp_t *udp)
 {
         async_exch_t *exch = async_exchange_begin(udp->sess);
@@ -55 +55 @@
         
         port_id_t port;
-        errno_t rc = async_create_callback_port(exch, INTERFACE_UDP_CB, 0, 0,
+        int rc = async_create_callback_port(exch, INTERFACE_UDP_CB, 0, 0,
             udp_cb_conn, udp, &port);
         
@@ -63 +63 @@
                 return rc;
 
-        errno_t retval;
+        int retval;
         async_wait_for(req, &retval);
 
@@ -75 +75 @@
  *         cannot be contacted
  */
-errno_t udp_create(udp_t **rudp)
+int udp_create(udp_t **rudp)
 {
         udp_t *udp;
         service_id_t udp_svcid;
-        errno_t rc;
+        int rc;
 
         udp = calloc(1, sizeof(udp_t));
@@ -160 +160 @@
  * @return EOK on success or an error code.
  */
-errno_t udp_assoc_create(udp_t *udp, inet_ep2_t *epp, udp_cb_t *cb, void *arg,
+int udp_assoc_create(udp_t *udp, inet_ep2_t *epp, udp_cb_t *cb, void *arg,
     udp_assoc_t **rassoc)
 {
@@ -173 +173 @@
         exch = async_exchange_begin(udp->sess);
         aid_t req = async_send_0(exch, UDP_ASSOC_CREATE, &answer);
-        errno_t rc = async_data_write_start(exch, (void *)epp,
+        int rc = async_data_write_start(exch, (void *)epp,
             sizeof(inet_ep2_t));
         async_exchange_end(exch);
 
         if (rc != EOK) {
-                errno_t rc_orig;
+                int rc_orig;
                 async_wait_for(req, &rc_orig);
                 if (rc_orig != EOK)
@@ -200 +200 @@
 error:
         free(assoc);
-        return (errno_t) rc;
+        return (int) rc;
 }
 
@@ -220 +220 @@
 
         exch = async_exchange_begin(assoc->udp->sess);
-        errno_t rc = async_req_1_0(exch, UDP_ASSOC_DESTROY, assoc->id);
+        int rc = async_req_1_0(exch, UDP_ASSOC_DESTROY, assoc->id);
         async_exchange_end(exch);
 
@@ -232 +232 @@
  * @param flags Flags
  */
-errno_t udp_assoc_set_nolocal(udp_assoc_t *assoc)
+int udp_assoc_set_nolocal(udp_assoc_t *assoc)
 {
         async_exch_t *exch;
 
         exch = async_exchange_begin(assoc->udp->sess);
-        errno_t rc = async_req_1_0(exch, UDP_ASSOC_SET_NOLOCAL, assoc->id);
+        int rc = async_req_1_0(exch, UDP_ASSOC_SET_NOLOCAL, assoc->id);
         async_exchange_end(exch);
 
@@ -252 +252 @@
  * @return EOK on success or an error code
  */
-errno_t udp_assoc_send_msg(udp_assoc_t *assoc, inet_ep_t *dest, void *data,
+int udp_assoc_send_msg(udp_assoc_t *assoc, inet_ep_t *dest, void *data,
     size_t bytes)
 {
@@ -260 +260 @@
         aid_t req = async_send_1(exch, UDP_ASSOC_SEND_MSG, assoc->id, NULL);
 
-        errno_t rc = async_data_write_start(exch, (void *)dest,
+        int rc = async_data_write_start(exch, (void *)dest,
             sizeof(inet_ep_t));
         if (rc != EOK) {
@@ -318 +318 @@
  * @return EOK on success or an error code.
  */
-errno_t udp_rmsg_read(udp_rmsg_t *rmsg, size_t off, void *buf, size_t bsize)
+int udp_rmsg_read(udp_rmsg_t *rmsg, size_t off, void *buf, size_t bsize)
 {
         async_exch_t *exch;
@@ -325 +325 @@
         exch = async_exchange_begin(rmsg->udp->sess);
         aid_t req = async_send_1(exch, UDP_RMSG_READ, off, &answer);
-        errno_t rc = async_data_read_start(exch, buf, bsize);
+        int rc = async_data_read_start(exch, buf, bsize);
         async_exchange_end(exch);
 
@@ -333 +333 @@
         }
 
-        errno_t retval;
+        int retval;
         async_wait_for(req, &retval);
         if (retval != EOK) {
@@ -382 +382 @@
  * @return EOK on success or an error code
  */
-static errno_t udp_rmsg_info(udp_t *udp, udp_rmsg_t *rmsg)
+static int udp_rmsg_info(udp_t *udp, udp_rmsg_t *rmsg)
 {
         async_exch_t *exch;
@@ -390 +390 @@
         exch = async_exchange_begin(udp->sess);
         aid_t req = async_send_0(exch, UDP_RMSG_INFO, &answer);
-        errno_t rc = async_data_read_start(exch, &ep, sizeof(inet_ep_t));
+        int rc = async_data_read_start(exch, &ep, sizeof(inet_ep_t));
         async_exchange_end(exch);
 
@@ -398 +398 @@
         }
 
-        errno_t retval;
+        int retval;
         async_wait_for(req, &retval);
         if (retval != EOK)
@@ -415 +415 @@
  * @return EOK on success or an error code
  */
-static errno_t udp_rmsg_discard(udp_t *udp)
+static int udp_rmsg_discard(udp_t *udp)
 {
         async_exch_t *exch;
 
         exch = async_exchange_begin(udp->sess);
-        errno_t rc = async_req_0_0(exch, UDP_RMSG_DISCARD);
+        int rc = async_req_0_0(exch, UDP_RMSG_DISCARD);
         async_exchange_end(exch);
 
@@ -434 +434 @@
  * @return EOK on success, EINVAL if no association with the given ID exists
  */
-static errno_t udp_assoc_get(udp_t *udp, sysarg_t id, udp_assoc_t **rassoc)
+static int udp_assoc_get(udp_t *udp, sysarg_t id, udp_assoc_t **rassoc)
 {
         list_foreach(udp->assoc, ludp, udp_assoc_t, assoc) {
@@ -459 +459 @@
         udp_rmsg_t rmsg;
         udp_assoc_t *assoc;
-        errno_t rc;
+        int rc;
 
         while (true) {