Changeset e1e4192 in mainline for uspace/srv/locsrv

Timestamp:

2012-06-03T20:45:58Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

90478727

Parents:

f7e69f5 (diff), 3123d2a (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 mainline changes

Location:

uspace/srv/locsrv

Files:

• locsrv.c (modified) (2 diffs)
• locsrv.h (modified) (1 diff)

uspace/srv/locsrv/locsrv.c

@@ -390 +390 @@
          */
         list_initialize(&server->services);
-
         link_initialize(&server->servers);
         
@@ -1493 +1492 @@
         
         /* Register location service at naming service */
-        if (service_register(SERVICE_LOC) != EOK)
-                return -1;
+        int rc = service_register(SERVICE_LOC);
+        if (rc != EOK)
+                return rc;
         
         printf("%s: Accepting connections\n", NAME);

uspace/srv/locsrv/locsrv.h

@@ -86 +86 @@
         /** Link to global list of services (services_list) */
         link_t services;
+        
         /** Link to server list of services (loc_server_t.services) */
         link_t server_services;
+        
         /** Link to list of services in category (category_t.services) */
         link_t cat_services;
+        
         /** List of category memberships (svc_categ_t) */
         list_t cat_memb;
+        
         /** Unique service identifier */
         service_id_t id;
+        
         /** Service namespace */
         loc_namespace_t *namespace;
+        
         /** Service name */
         char *name;
+        
         /** Supplier of this service */
         loc_server_t *server;
+        
         /** Use this interface when forwarding to server. */
         sysarg_t forward_interface;