Changes in uspace/srv/locsrv/locsrv.c [25a179e:64d138b] in mainline

File:

• uspace/srv/locsrv/locsrv.c (modified) (12 diffs)

uspace/srv/locsrv/locsrv.c

@@ -47 +47 @@
 #include <stdlib.h>
 #include <str.h>
-#include <str_error.h>
 #include <ipc/loc.h>
 #include <assert.h>
@@ -599 +598 @@
         }
         
-        int retval = async_data_read_finalize(callid, cat->name,
+        sysarg_t retval = async_data_read_finalize(callid, cat->name,
             min(size, act_size));
         
@@ -647 +646 @@
         }
         
-        int retval = async_data_read_finalize(callid, fqn,
+        sysarg_t retval = async_data_read_finalize(callid, fqn,
             min(size, act_size));
         free(fqn);
@@ -694 +693 @@
         }
         
-        int retval = async_data_read_finalize(callid, svc->server->name,
+        sysarg_t retval = async_data_read_finalize(callid, svc->server->name,
             min(size, act_size));
         
@@ -1000 +999 @@
         fibril_mutex_unlock(&cdir.mutex);
         
-        int retval = async_data_read_finalize(callid, id_buf, size);
+        sysarg_t retval = async_data_read_finalize(callid, id_buf, size);
         free(id_buf);
         
@@ -1047 +1046 @@
         }
         
-        int retval = async_data_read_finalize(callid, desc, size);
+        sysarg_t retval = async_data_read_finalize(callid, desc, size);
         
         free(desc);
@@ -1110 +1109 @@
         }
         
-        int retval = async_data_read_finalize(callid, desc, size);
+        sysarg_t retval = async_data_read_finalize(callid, desc, size);
         
         free(desc);
@@ -1163 +1162 @@
         fibril_mutex_unlock(&cdir.mutex);
         
-        int retval = async_data_read_finalize(callid, id_buf, size);
+        sysarg_t retval = async_data_read_finalize(callid, id_buf, size);
         free(id_buf);
         
@@ -1278 +1277 @@
         catid_t cat_id;
         service_id_t svc_id;
-        int retval;
+        sysarg_t retval;
         
         svc_id = IPC_GET_ARG1(*icall);
@@ -1348 +1347 @@
         categ_dir_add_cat(&cdir, cat);
 
-        cat = category_new("console");
-        categ_dir_add_cat(&cdir, cat);
-
         cat = category_new("clock");
         categ_dir_add_cat(&cdir, cat);
 
         cat = category_new("test3");
+        categ_dir_add_cat(&cdir, cat);
+
+        cat = category_new("usbdiag");
         categ_dir_add_cat(&cdir, cat);
 
@@ -1530 +1529 @@
         int rc = async_create_port(INTERFACE_LOC_SUPPLIER,
             loc_connection_supplier, NULL, &port);
-        if (rc != EOK) {
-                printf("%s: Error while creating supplier port: %s\n", NAME, str_error(rc));
+        if (rc != EOK)
                 return rc;
-        }
         
         rc = async_create_port(INTERFACE_LOC_CONSUMER,
             loc_connection_consumer, NULL, &port);
-        if (rc != EOK) {
-                printf("%s: Error while creating consumer port: %s\n", NAME, str_error(rc));
+        if (rc != EOK)
                 return rc;
-        }
         
         /* Set a handler of incomming connections */
@@ -1547 +1542 @@
         /* Register location service at naming service */
         rc = service_register(SERVICE_LOC);
-        if (rc != EOK) {
-                printf("%s: Error while registering service: %s\n", NAME, str_error(rc));
+        if (rc != EOK)
                 return rc;
-        }
         
         printf("%s: Accepting connections\n", NAME);