Changeset 241f1985 in mainline for uspace/srv/locsrv/locsrv.c

Timestamp:

2019-08-31T10:45:17Z (5 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Children:

102f641

Parents:

f92b315

git-author:

Matthieu Riolo <matthieu.riolo@…> (2019-08-23 22:04:34)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2019-08-31 10:45:17)

Message:

Correcting failure from previous merge

The commits from Michal Koutný from the branch system-daemon
where built on a old version of Helenos. Because of this
many types and API functions have changed. This commit
upgrades the merge code

File:

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

uspace/srv/locsrv/locsrv.c

@@ -584 +584 @@
                 free(service);
                 free(unit_name);
-                async_answer_0(iid, rc);
+                async_answer_0(icall, rc);
                 return;
         }
@@ -591 +591 @@
                 sysman_exposee_added(unit_name);
         } else {
-                sysman_main_exposee_added(unit_name, icall->in_task_id);
+                sysman_main_exposee_added(unit_name, icall->task_id);
         }
         free(unit_name);
@@ -619 +619 @@
  *
  */
-static void loc_service_unregister(ipc_callid_t iid, ipc_call_t *icall,
-    loc_server_t *server)
+static void loc_service_unregister(ipc_call_t *icall, loc_server_t *server)
 {
         loc_service_t *svc;
@@ -840 +839 @@
         fibril_mutex_lock(&services_list_mutex);
         const loc_service_t *svc;
-        int flags = ipc_get_arg1(*icall);
+        int flags = ipc_get_arg1(icall);
         bool start_requested = false;
         
@@ -889 +888 @@
 finish:
         if (rc == EOK) {
-                async_answer_1(iid, EOK, svc->id);
+                async_answer_1(icall, EOK, svc->id);
         } else {
-                async_answer_0(iid, rc);
+                async_answer_0(icall, rc);
         }
         
@@ -1669 +1668 @@
         if (rc != EOK) {
                 printf("%s: Error while registering broker service: %s\n", NAME, str_error(rc));
+                return rc;
+        }
 
         /* Let sysman know we are broker */