Changeset 132ab5d1 in mainline for uspace/srv/locsrv/locsrv.c

Timestamp:

2018-01-30T03:20:45Z (6 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

5a6cc679

Parents:

8bfb163 (diff), 6a5d05b (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 commit '6a5d05bd2551e64111bea4f9332dd7448c26ce84' into forwardport

Separate return value from error code in gen_irq_code*().

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