Changes in uspace/srv/net/ethip/ethip.c [b7fd2a0:f9b2cb4c] in mainline

File:

• uspace/srv/net/ethip/ethip.c (modified) (18 diffs)

uspace/srv/net/ethip/ethip.c

@@ -53 +53 @@
 #define NAME "ethip"
 
-static errno_t ethip_open(iplink_srv_t *srv);
-static errno_t ethip_close(iplink_srv_t *srv);
-static errno_t ethip_send(iplink_srv_t *srv, iplink_sdu_t *sdu);
-static errno_t ethip_send6(iplink_srv_t *srv, iplink_sdu6_t *sdu);
-static errno_t ethip_get_mtu(iplink_srv_t *srv, size_t *mtu);
-static errno_t ethip_get_mac48(iplink_srv_t *srv, addr48_t *mac);
-static errno_t ethip_set_mac48(iplink_srv_t *srv, addr48_t *mac);
-static errno_t ethip_addr_add(iplink_srv_t *srv, inet_addr_t *addr);
-static errno_t ethip_addr_remove(iplink_srv_t *srv, inet_addr_t *addr);
+static int ethip_open(iplink_srv_t *srv);
+static int ethip_close(iplink_srv_t *srv);
+static int ethip_send(iplink_srv_t *srv, iplink_sdu_t *sdu);
+static int ethip_send6(iplink_srv_t *srv, iplink_sdu6_t *sdu);
+static int ethip_get_mtu(iplink_srv_t *srv, size_t *mtu);
+static int ethip_get_mac48(iplink_srv_t *srv, addr48_t *mac);
+static int ethip_set_mac48(iplink_srv_t *srv, addr48_t *mac);
+static int ethip_addr_add(iplink_srv_t *srv, inet_addr_t *addr);
+static int ethip_addr_remove(iplink_srv_t *srv, inet_addr_t *addr);
 
 static void ethip_client_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg);
@@ -77 +77 @@
 };
 
-static errno_t ethip_init(void)
+static int ethip_init(void)
 {
         async_set_fallback_port_handler(ethip_client_conn, NULL);
         
-        errno_t rc = loc_server_register(NAME);
+        int rc = loc_server_register(NAME);
         if (rc != EOK) {
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering server.");
@@ -94 +94 @@
 }
 
-errno_t ethip_iplink_init(ethip_nic_t *nic)
-{
-        errno_t rc;
+int ethip_iplink_init(ethip_nic_t *nic)
+{
+        int rc;
         service_id_t sid;
         category_id_t iplink_cat;
@@ -108 +108 @@
         nic->iplink.arg = nic;
 
-        if (asprintf(&svc_name, "net/eth%u", ++link_num) < 0) {
+        rc = asprintf(&svc_name, "net/eth%u", ++link_num);
+        if (rc < 0) {
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Out of memory.");
-                rc = ENOMEM;
                 goto error;
         }
@@ -158 +158 @@
 }
 
-static errno_t ethip_open(iplink_srv_t *srv)
+static int ethip_open(iplink_srv_t *srv)
 {
         log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_open()");
@@ -164 +164 @@
 }
 
-static errno_t ethip_close(iplink_srv_t *srv)
+static int ethip_close(iplink_srv_t *srv)
 {
         log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_close()");
@@ -170 +170 @@
 }
 
-static errno_t ethip_send(iplink_srv_t *srv, iplink_sdu_t *sdu)
+static int ethip_send(iplink_srv_t *srv, iplink_sdu_t *sdu)
 {
         log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_send()");
@@ -177 +177 @@
         eth_frame_t frame;
         
-        errno_t rc = arp_translate(nic, sdu->src, sdu->dest, frame.dest);
+        int rc = arp_translate(nic, sdu->src, sdu->dest, frame.dest);
         if (rc != EOK) {
                 log_msg(LOG_DEFAULT, LVL_WARN, "Failed to look up IPv4 address 0x%"
@@ -201 +201 @@
 }
 
-static errno_t ethip_send6(iplink_srv_t *srv, iplink_sdu6_t *sdu)
+static int ethip_send6(iplink_srv_t *srv, iplink_sdu6_t *sdu)
 {
         log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_send6()");
@@ -216 +216 @@
         void *data;
         size_t size;
-        errno_t rc = eth_pdu_encode(&frame, &data, &size);
+        int rc = eth_pdu_encode(&frame, &data, &size);
         if (rc != EOK)
                 return rc;
@@ -226 +226 @@
 }
 
-errno_t ethip_received(iplink_srv_t *srv, void *data, size_t size)
+int ethip_received(iplink_srv_t *srv, void *data, size_t size)
 {
         log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_received(): srv=%p", srv);
@@ -234 +234 @@
         
         eth_frame_t frame;
-        errno_t rc = eth_pdu_decode(data, size, &frame);
+        int rc = eth_pdu_decode(data, size, &frame);
         if (rc != EOK) {
                 log_msg(LOG_DEFAULT, LVL_DEBUG, " - eth_pdu_decode failed");
@@ -269 +269 @@
 }
 
-static errno_t ethip_get_mtu(iplink_srv_t *srv, size_t *mtu)
+static int ethip_get_mtu(iplink_srv_t *srv, size_t *mtu)
 {
         log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_get_mtu()");
@@ -276 +276 @@
 }
 
-static errno_t ethip_get_mac48(iplink_srv_t *srv, addr48_t *mac)
+static int ethip_get_mac48(iplink_srv_t *srv, addr48_t *mac)
 {
         log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_get_mac48()");
@@ -286 +286 @@
 }
 
-static errno_t ethip_set_mac48(iplink_srv_t *srv, addr48_t *mac)
+static int ethip_set_mac48(iplink_srv_t *srv, addr48_t *mac)
 {
         log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_set_mac48()");
@@ -296 +296 @@
 }
 
-static errno_t ethip_addr_add(iplink_srv_t *srv, inet_addr_t *addr)
+static int ethip_addr_add(iplink_srv_t *srv, inet_addr_t *addr)
 {
         ethip_nic_t *nic = (ethip_nic_t *) srv->arg;
@@ -303 +303 @@
 }
 
-static errno_t ethip_addr_remove(iplink_srv_t *srv, inet_addr_t *addr)
+static int ethip_addr_remove(iplink_srv_t *srv, inet_addr_t *addr)
 {
         ethip_nic_t *nic = (ethip_nic_t *) srv->arg;
@@ -312 +312 @@
 int main(int argc, char *argv[])
 {
-        errno_t rc;
+        int rc;
 
         printf(NAME ": HelenOS IP over Ethernet service\n");