Changes in uspace/srv/net/dnsrsrv/dnsrsrv.c [1d6dd2a:b688fd8] in mainline

File:

• uspace/srv/net/dnsrsrv/dnsrsrv.c (modified) (10 diffs)

uspace/srv/net/dnsrsrv/dnsrsrv.c

@@ -36 +36 @@
 #include <async.h>
 #include <errno.h>
-#include <str_error.h>
 #include <io/log.h>
 #include <ipc/dnsr.h>
@@ -43 +42 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <str.h>
 #include <task.h>
 
@@ -55 +53 @@
 static void dnsr_client_conn(ipc_callid_t, ipc_call_t *, void *);
 
-static errno_t dnsr_init(void)
-{
-        errno_t rc;
+static int dnsr_init(void)
+{
+        int rc;
         log_msg(LOG_DEFAULT, LVL_DEBUG, "dnsr_init()");
 
@@ -70 +68 @@
         rc = loc_server_register(NAME);
         if (rc != EOK) {
-                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering server: %s.", str_error(rc));
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering server (%d).", rc);
                 transport_fini();
                 return EEXIST;
@@ -78 +76 @@
         rc = loc_service_register(SERVICE_NAME_DNSR, &sid);
         if (rc != EOK) {
-                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering service: %s.", str_error(rc));
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering service (%d).", rc);
                 transport_fini();
                 return EEXIST;
@@ -94 +92 @@
         
         char *name;
-        errno_t rc = async_data_write_accept((void **) &name, true, 0,
+        int rc = async_data_write_accept((void **) &name, true, 0,
             DNS_NAME_MAX_SIZE, 0, NULL);
         if (rc != EOK) {
@@ -146 +144 @@
                 async_answer_0(callid, rc);
         
-        async_answer_0(iid, rc);
+        async_answer_0(iid, (sysarg_t) rc);
         
         dns_hostinfo_destroy(hinfo);
@@ -172 +170 @@
         // FIXME locking
         
-        errno_t rc = async_data_read_finalize(callid, &dns_server_addr, size);
+        int rc = async_data_read_finalize(callid, &dns_server_addr, size);
         if (rc != EOK)
                 async_answer_0(callid, rc);
@@ -200 +198 @@
         // FIXME locking
         
-        errno_t rc = async_data_write_finalize(callid, &dns_server_addr, size);
-        if (rc != EOK) {
-                async_answer_0(callid, rc);
-                async_answer_0(iid, rc);
-        }
-        
-        async_answer_0(iid, rc);
+        int rc = async_data_write_finalize(callid, &dns_server_addr, size);
+        if (rc != EOK) {
+                async_answer_0(callid, rc);
+                async_answer_0(iid, rc);
+        }
+        
+        async_answer_0(iid, (sysarg_t) rc);
 }
 
@@ -247 +245 @@
 int main(int argc, char *argv[])
 {
-        errno_t rc;
+        int rc;
 
         printf("%s: DNS Resolution Service\n", NAME);